Merge branch 'master' of github.com:GeoNode/geonode

geonode/context_processors.py

geonode/geoserver/helpers.py

geonode/layers/models.py

geonode/layers/ows.py

geonode/layers/populate_layers_data.py

geonode/layers/templates/layers/layer_detail.html

geonode/layers/templates/layers/layer_geoext_map.html

geonode/layers/tests.py

geonode/layers/utils.py

geonode/layers/views.py

geonode/local_settings.py.sample

geonode/maps/migrations/0011_set_local.py

geonode/maps/models.py

geonode/maps/templates/maps/map_embed.html

geonode/maps/templates/maps/map_geoexplorer.js

geonode/maps/templates/maps/map_include.html

geonode/maps/templates/maps/map_sdk.js

geonode/maps/views.py

geonode/middleware.py

geonode/proxy/views.py