to resolve the conflicts
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development

Conflicts:
	.settings/com.vaadin.integration.eclipse.prefs
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development

Conflicts:
	.settings/com.vaadin.integration.eclipse.prefs
	WebContent/VAADIN/widgetsets/com.swifta.mats.web.widgetset.Mats_web_portalWidgetset/com.swifta.mats.web.widgetset.Mats_web_portalWidgetset.nocache.js
	WebContent/VAADIN/widgetsets/com.swifta.mats.web.widgetset.Mats_web_portalWidgetset/compilation-mappings.txt