Fix possible NPE
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Merge branch '1.5.x' of github.com:geosdi/geo-platform into 1.5.x
Upgrade to spring 3.2.3-FInal
Upgrade to spring-security 3.1.4-RELEASE
Using GSManager enhanced