adding changes small fixings..
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/.settings/com.vaadin.integration.eclipse.prefs