Merge branch 'develop'
Merge branch 'develop' of github.com:cloudfoundry/uaa into develop
[release] Bump version to 1.4.1
Merge branch 'release/1.4.1' 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
[release] Bump version for next release to 1.4.2-SNAPSHOT
Merge pull request #36 from vedyval/develop

Bump version in develop to 1.4.2-SNAPSHOT