Remove OpenGeo Repo
Upgrade Spring Version
Merge with Master/1.6.x