Merge pull request #1248 from mwengren/fix_template_inheritance

Fix missing parent template references in a few template files.
Merge branch 'master' of github.com:GeoNode/geonode
Added disable_ssl_certificate_validation to some new Catalog calls in models(maps)
Merge branch 'geoserver_ssl_cert_disable' into geoserver_updatelayers_dev