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.
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.
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge pull request #1129 from tomkralidis/master

execute WPS statistics only if WPS is enabled on OGC_SERVER (#1128)
Merge pull request #1119 from capooti/issue-1099

Fixes Issue 1099 (i18n doc not being built)
Changed ogc_server_settings.ows to use PUBLIC_URL if present
Merge branch 'master' of https://github.com/GeoNode/geonode
update the user registration
Merge branch 'master' of https://github.com/GeoNode/geonode
Updated first part of the admin data tutorial.