Added support for 'proxy' OGC_SERVER config that allows secondary LOCATION config for public GeoServer access point
Remove redundant config in settings.py
Fix syntax error for check of 'CATALOG_WRITE_ENABLED' in layers/models.py
Merge remote-tracking branch 'upstream/master' into geoserver_proxy
Added back in the 'DATASTORE' key in OGC_SERVER OPTIONS dict that was dropped
include raty in assets.min.js
Merge pull request #1108 from vdeparday/master

Fixes #1107
Merge branch 'master' of https://github.com/GeoNode/geonode

Conflicts:
	geonode/static/lib/js/assets.min.js
add admin panel section
updated the install procedure
finished documentation sphinx guidelines and add logo for example
Added a very basic workflow to manage the i18n documentation process. Refs #1099.
documentation guidelines updated and completed
Merge branch 'master' of https://github.com/GeoNode/geonode into newdoc
reorganize the admin tutorial
more doc install reorganization
Changed the set_metadata function to safely check for the date key.
Merge pull request #1109 from capooti/sphinx-i18n-doc

Added a very basic workflow to manage the i18n documentation process.
Merge pull request #1110 from garnertb/master

Changed the set_metadata function to safely check for the date key.
Updated changelog for version 2.0b54