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

Conflicts:
	cmsadmin/src/com/contento3/web/template/TemplateUIManager.java
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/src/com/contento3/web/template/TemplateUIManager.java