Merge branch 'master' into es17.01

examples/demo/site/config/cms.ini

@@ -22,6 +22,7 @@ email=noreply@example.com
 # Name of website theme. 
 theme=bootstrap
 
+
 [notification]
 # By default, notification.email = site.email
 # you can change here the email that will receive internal messages.
@@ -34,7 +35,7 @@ subject_prefix=[Eiffel CMS]
 #from=...
 smtp=localhost:25
 #sendmail=site\bin\roc_sendmail.bat
-output=site\db\mailer.log
+output=site\db\mails
 
 [modules]
 # Module status
@@ -56,6 +57,9 @@ output=site\db\mailer.log
 #openid.token=
 #oauth.token=
 
-[admin]
+
+[administration]
+base_path=/roc-admin
+#theme=admin
 # CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
 installation_access=all