Refactoring of GeoServer into OGC_SERVER settings and other touchup in settings.py
Change settings.GEOSERVER_BASE_URL to settings.OGC_SERVER['default']['LOCATION']
Change ref to GEOSERVER_BASE_URL in pavement.py
Switch GEOSERVER_CREDENTIALS to use new OGC_SERVER dict from settings.py
Fix OGC_SERVER reference in MAP_BASELAYERS
Fix missing : in geonode/layers/views.py
Fix typo in geonode/maps/models.py
Temp fix in geonode/context_processors.py until @ingenieroariel fixes this for realz
Adjust to changes in DB_DATASTORE in settings.py
More temp fixes in context_processors.py
Fix DB_DATASTORE references
Hide perms widgets if GS_SECURITY_ENABLED = False
set printService to empty string if MapFish is not enabled
Merge branch 'master' of github.com:GeoNode/geonode into vanilla_geoserver
Switch bower to grunt-cli for travis
adjust the db_datastore lookup
enforce the check on the permissions structure
Merge pull request #11 from simod/vanilla_geoserver

fix datastore and permissions check
Merge branch 'master' of github.com:GeoNode/geonode into vanilla_geoserver

Conflicts:
	geonode/upload/utils.py
Merge branch 'vanilla_geoserver' of github.com:jj0hns0n/geonode into vanilla_geoserver