Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	common/pom.xml
	pom.xml
	samples/api/pom.xml
	samples/app/pom.xml
	samples/pom.xml
	scim/pom.xml
	uaa/pom.xml