Change back to use of django-admin.py (vs django-admin)
Merge branch 'master' of github.com:GeoNode/geonode