Various fix and imporvements to align with the latest Geo-Platform updates
Merge branch 'master' of github.com:geosdi/geoplatform-base-app