editorial fixes (sort alphabetically, etc.)
Merge branch 'master' of https://github.com/GeoNode/geonode