Merge branch 'master' into feature/new-registration-page

conf/application-example.conf

@@ -0,0 +1,26 @@
+security {
+  jsonWebToken {
+    privateKeyFilename = "local/local_private_key.der"
+    publicKeyFilename = "local/local_public_key.der"
+  }
+}
+
+ldap {
+  # override these if you wish to make use of ldap.
+  # otherwise, configure dependency injection to use the in-memory equivalents
+  # in /app/com.yetu.oauth2provider/registry/ServicesRegistry for all LDAP-related interfaces
+  #  username="..."
+  #  password="..."
+  #  hostname="..."
+  #  port=1389
+}
+
+smtp {
+  # set these if you wish to send real emails.
+  #  mock = false
+  #  host =
+  #  port =
+  #  ssl = true
+  #  user =
+  #  password =
+}

public/stylesheets/setup.css

@@ -124,7 +124,7 @@ header{
 
 .left__content-faq{
 	display: block;
-	width: 35%;
+	width: 55%;
 	text-align: center;
 }