Merge pull request #1283 from ppasq/templates

Fix some CSS in Replace Layer template
Merge branch 'master' of https://github.com/GeoNode/geonode into templates

# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode: