Conf
Merge remote-tracking branch 'origin/master'

Conflicts:
	soat-immo-web/pom.xml