Better 500 error
Merge branch 'master' of github.com:GeoNode/geonode
Committed changelog