Merge branch 'develop' into 'master'

Develop



See merge request !100

app/modules/frontend/views/layout.scala.html

@@ -123,7 +123,7 @@
             errorCodes.error1016 = "@text("call-process.error1016")";
             errorCodes.error1017 = "@text("call-process.error1017")";
 
-            window.cookieconsent_options = {"message":"@text("layout.cookies.cookies-message")", "dismiss":"@text("layout.cookies.cookies-accept")", "learnMore":"@text("layout.cookies.cookies-more-info")", "link":"@WebTemplateSettings.getSetting("layout.cookies-more-info-link")", "theme":"light-bottom"};
+            window.cookieconsent_options = {"message":"@text("layout.cookies.cookies-message")", "dismiss":"@text("layout.cookies.cookies-accept")", "learnMore":"@text("layout.cookies.cookies-more-info")", "link":"@WebTemplateSettings.getSetting("layout.cookies-more-info-link")", "theme":"@routes.WebJarAssets.at(WebJarAssets.locate("light-bottom.css"))"};
         </script>
 
         @Html(WebTemplateSettings.getSetting("layout.javascript.in-head"))

build.sbt

@@ -26,7 +26,7 @@ rpmBrpJavaRepackJars := false
 
 name := """liveedu"""
 
-version := "2.3.0"
+version := "2.3.1"
 
 //scalaVersion := "2.11.1"