Merge branch 'master' into es17.01

# Conflicts:
#	examples/demo/demo.ecf
#	modules/admin/admin-safe.ecf

examples/demo/demo.ecf

@@ -40,6 +40,7 @@
 		<library name="cms_sitemap_module" location="..\..\modules\sitemap\sitemap.ecf" readonly="false"/>
 		<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth.ecf" readonly="false"/>
 		<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy.ecf" readonly="false"/>
+		<library name="embedded_video_module" location="..\..\modules\embedded_video\embedded_video.ecf" readonly="false"/>
 		<library name="cms_wikitext_module" location="..\..\modules\wikitext\wikitext.ecf" readonly="false"/>
 		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3.ecf" readonly="false"/>
 		<!--

examples/demo/roc.cfg

@@ -22,6 +22,7 @@
 		"taxonomy": 		{ "location": "../../modules/taxonomy" },
 		"files": 			{ "location": "../../modules/files" },
 		"custom_block": 	{ "location": "../../modules/custom_block" },
+		"embedded_video": 			{ "location": "../../modules/embedded_video" },
 		"wikitext": 		{ "location": "../../modules/wikitext" },
 		"messaging": 		{ "location": "../../modules/messaging" },
 		"comments": 		{ "location": "../../modules/comments" }

examples/demo/site/db/mails/README.md

@@ -0,0 +1 @@
+This directory can be used to keep emails sent by the CMS.

examples/demo/src/demo_cms_execution.e

@@ -76,6 +76,7 @@ feature -- CMS modules
 
 				-- Wiki
 			a_setup.register_module (create {WIKITEXT_MODULE}.make)
+			a_setup.register_module (create {EMBEDDED_VIDEO_MODULE}.make)
 
 				-- Recent changes
 			a_setup.register_module (create {CMS_RECENT_CHANGES_MODULE}.make)