Minor update.
Merge branch 'master' of https://github.com/KDMgit/geonode

Conflicts:
	geonode/layers/utils.py
	geonode/layers/views.py