Added support for 'proxy' OGC_SERVER config that allows secondary LOCATION config for public GeoServer access point
Remove redundant config in settings.py
Added an option to updatelayers to check for 'advertised' status of GeoServer layers and skip if false.  Requires modified gsconfig.py
Fix syntax error for check of 'CATALOG_WRITE_ENABLED' in layers/models.py
Change to --skip-unadvertised filter to accept 'None' values: in some cases there will be no 'advertised' property in REST API representations
Change --skip-unadvertised option help msg
Merge remote-tracking branch 'upstream/master' into geoserver_proxy
Added back in the 'DATASTORE' key in OGC_SERVER OPTIONS dict that was dropped
Added the gettext_compact option in conf.py file.
Updated the -How to translate GeoNode's Documentation- file.
Added the initial .po files to git after a tx pull.
fix installation from config file
Add ogc_server_settings.public_url and merge support for public url endpoints and read-only GeoServer. Merge branch 'master' of github.com:GeoNode/geonode.
add some other admin docs
Merge pull request #1127 from ppasq/templates

Layout fixes to #1047, #1053, some bugs in #971
ows url should link to /ows instead of /wms
Merge branch 'master' of https://github.com/GeoNode/geonode
Take out the geoserver installation from the install script
Merge branch 'master' of https://github.com/GeoNode/geonode
further work on the admin doc