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

Conflicts:
	cmsadmin/.settings/com.vaadin.integration.eclipse.prefs
	cmsadmin/WebContent/VAADIN/widgetsets/com.contento3.web.widgetset.CmsadminWidgetset/com.contento3.web.widgetset.CmsadminWidgetset.nocache.js
	cmsadmin/WebContent/VAADIN/widgetsets/com.contento3.web.widgetset.CmsadminWidgetset/compilation-mappings.txt
resolving conflicts after merge.