Updated changelog
Merge branch 'master' of github.com:GeoNode/geonode
Updated changelog
Updated geoserver url in local_settings