fix deployment settings
Merge branch 'master' of github.com:kanei/ESF-MU-Portal

Conflicts:
	pom.xml