Merge branch 'releases/1.9.0'
Bump version for hotfix
Upgrade Spring Framework to 4.0.8 to address CVE-2014-3625
http://www.pivotal.io/security/cve-2014-3625
Merge branch 'hotfix/1.9.1' into develop

Signed-off-by: Jesse Zhang <jz@pivotallabs.com>

Conflicts:
	gradle.properties
Bump next developer version

Signed-off-by: Jesse Zhang <jz@pivotallabs.com>
[skip ci]
Initial merger of Login Server and UAA
What remains is swap all controllers in the Login Server to use beans instead of rest templates

[skip ci]
Add in test resources for unit tests [skip ci]
For the user account settings, approvals should be pulled from the UAA directly rather than
from a rest template
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Generate build.properties and git.properties in a shared classpath
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Modify default localhost URLs to point to /uaa
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Integrate the SAML profile
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
SAML code has been moved into common, support unit tests properly in classpath
Adjustment made for SAML authentication and Passcode tokens

https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Adjust account controller to not use RestTemplate
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Move SAML config test to where it can read the resources
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Moved LoginMockMvcIntegrationTests to uaa module, tests pass without
modification
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Moved BootStrapTests from login to uaa
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
EmailResetPasswordService bean now resides in UAA, uses controller directly
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Restore original login.yml without test data present
Move test to initiate Spring application context
https://www.pivotaltracker.com/story/show/82481136
[#82481136]
Adjust tests to use XmlWebApplicationContext as Annotation... doesn't pick up our Java config

https://www.pivotaltracker.com/story/show/82481136
[#82481136]