Merge branch 'develop' of github.com:fhanik/login-server into develop

Conflicts:
	login-server-common/src/test/java/org/cloudfoundry/identity/uaa/login/integration/AutologinContollerIntegrationTests.java
Merge branch 'develop' of github.com:fhanik/login-server into develop
Add in merge