Updated changelog
added Michael Diener to authors
Updated acls and resolve_user functions to use the user's profile setting.
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge branch 'master' of github.com:GeoNode/geonode
Updated changelog
Updated geoserver url in local_settings