Added on_delete=models.SET_NULL to thumbnails to prevent them from deleting layers, thanks Fuyou on #django
Merge branch 'master' of github.com:GeoNode/geonode
Now categories, keywords and date filters in layers, maps and docs page are collapsed by default. Thanks @ppasq!
Merge branch 'master' of github.com:GeoNode/geonode
use the dot in the cdv and kml extensions in uploader
Added support for Basic authentication end-to-end headers to the GeoNode proxy view.
Merge pull request #1247 from garnertb/master

Added support for Basic authentication end-to-end headers to the proxy view.
Added parent template references for block extra_head in a couple templates where missing
Merge branch 'fix_template_inheritance' into geoserver_updatelayers_dev