order keywords alphabetically and fix typo
Merge branch 'master' of https://github.com/GeoNode/geonode

Conflicts:
	geonode/layers/utils.py