Merge branch 'releases/1.2.7'
Merge branch 'releases/1.2.8'
Merge branch 'releases/1.2.9'
Merge pull request #38 from fhanik/develop

Develop
Merge branch 'releases/1.2.9'
Merge branch 'releases/1.2.9'
Merge branch 'releases/1.2.9'
update to the correct version of UAA
Merge branch 'releases/1.2.9'
1.2.10 release of the Login Servers
1.2.10 release of the Login Servers
enable upload of war files for future cf-release management
fix version number for release
1.3.0 release of the Login Servers
Merge branch 'releases/1.3.0'

Conflicts resolved for version numbers:
	login-server-common/pom.xml
	login-server/pom.xml
	pivotal-login-server/pom.xml
	pom.xml
	saml-login-server/pom.xml
Merge branch 'master' into releases/1.3.0
fix version
Revert "Merge branch 'master' into releases/1.3.0"

This reverts commit 4e696e6f14f76cb12e40887696ba6d168ad7bc83, reversing
changes made to 9c0c6aa2308b12d86e31ce20ea751f4cf345c7e2.
1.4.0 release of the Login Server
1.4.0 release of the Login Server