Make sure that MAP_BASELAYERS is current
No reason to make the final settings non-overridable

Move local_settings import to the end of the file.
Merge branch 'master' of https://github.com/GeoNode/geonode

Conflicts:
	geonode/settings.py
Use intermediate LayerFile model during upload.
Fixed keywords saving
Merge pull request #1467 from ingenieroariel/db-upload

Upload with intermediate files
Show UploadSession in admin
Moved layer_acls test to geonode/geoserver/tests
Group applications related to geoserver
Set a default for the typename
Added get_base_file method to Layer
Fixed references to typename in tests.
Add missing imports to geonode/geoserver/helpers.py
Safely ensure indexes exist before lookups when building the attribute map.
Prevent the cascade_delete geoserver helper from deleting entire GeoGIT stores.