UI improvements to TemplateUIManager.java
Code mirror improvements.
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/.classpath
	cmsadmin/.settings/com.vaadin.integration.eclipse.prefs
	cmsadmin/GWT development mode for cmsadmin.launch
	cmsadmin/GWT hosted mode for cmsadmin.launch
	cmsadmin/WebContent/VAADIN/widgetsets/com.contento3.web.widgetset.CmsadminWidgetset/com.contento3.web.widgetset.CmsadminWidgetset.nocache.js
	cmsadmin/src/com/contento3/web/template/TemplateUIManager.java
Merge branch 'develop' of https://github.com/contento3/Projects into develop
Merge branch 'develop' of https://github.com/contento3/Projects into develop
Image Toolbar Task
Merge branch 'develop' of https://github.com/contento3/Projects into develop
TemplateUIManager validation changes