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
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