code changes
Merge branch 'master' of https://github.com/Swifta/PSAWebPortal.git

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