Switch to JAVA 7
Merge branch 'master' of https://github.com/geosdi/geo-platform