changes in sites project
Merge branch 'develop' of https://github.com/contento3/Projects into develop
More improvements to user registration
1. User registration
2. Thymeleaf
3. Site dashboard item addition
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/WebContent/VAADIN/widgetsets/com.contento3.web.widgetset.CmsadminWidgetset/com.contento3.web.widgetset.CmsadminWidgetset.nocache.js
	core/src/main/java/com/contento3/cms/page/template/dao/TemplateDao.java
	core/src/main/java/com/contento3/cms/page/template/dao/impl/TemplateDaoHibernateImpl.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
cmsadmin project settings