Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/src/com/contento3/web/content/article/ArticleMgmtUIManager.java
	cmsadmin/src/com/contento3/web/content/article/listener/ArticleSaveListener.java
	cmsadmin/src/com/contento3/web/site/SitesDashBoard.java
	cmsadmin/src/com/contento3/web/user/security/PermissionTableBuilder.java
	core/src/main/java/com/contento3/cms/page/service/impl/PageServiceImpl.java
	core/src/main/java/com/contento3/cms/page/template/service/TemplateService.java
	core/src/main/java/com/contento3/cms/page/template/service/impl/TemplateServiceImpl.java
	core/src/main/java/com/contento3/dam/image/service/impl/ImageServiceImpl.java
Merge branch 'develop' of https://github.com/contento3/Projects into develop