use ogc server public url in ows links management
Merge branch 'master' of https://github.com/GeoNode/geonode
Activity stream enhancements.
Merge pull request #1228 from garnertb/master

Small JS additions to allow the importer backend to finish CSV uploads. ...
did some todos
Merge pull request #1227 from garnertb/activity_stream_rebase

Activity stream enhancements.
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge branch 'master' of https://github.com/GeoNode/geonode
manual config using ubuntu config file updated for clarity
removed un-neccessary text