Merge branch 'develop' of github.com:cloudfoundry/uaa into develop
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
Update .springBeans
[gh-38]: add cf client by default
[cfid-709] Add version label to UAA login and home page

[Fixes #47475823] uaa UI should show version number on mouseover
[cfid-674] Clean up YAML validation and make a FactoryBean

[#46077585]
refresh_token_validity should be returned by client admin.

This property was not being sent by ClientAdminEndpoints (as the
removeSecret method failed to copy it to the output data), thus
giving the impression that the value was null.

[Fixes #47635317]
Update gatling to 1.4.6
Make gatling test client autoapproved.

This saves having to deal with the approvals redirect during
the auth code flow. [Fixes #45520561].
Change gatling vmc/cf tests to use password grant.
Make hibernate validator optional in common jar
[cfid-665] Change format of prompts in /info

[Fixes #45864575]
[cfid-716] Update docs with the authorization rules around SCIM endpoints
Fix broken integration test.

/home URI doesn't exist anymore so returns a 403 instead of the
expected 302.
[cfid-724] Make /check_token return 400 for an invalid token.

This allows the client to distinguish between a failed client
authentication and an expired/invalid token. Perviously the endpoint
was acting as if the token was being used for authentication, when
in fact the client uses basic auth.

RemoteTokenServices now takes advantage of this and no longer
treats a 400 as an Http client error.
Update secoauth to 1.0.3.

Also cleaned up pom file formatting.
Revert sec-oauth version change.

Breaks integration tests.
Fix gatling maven config