Get rid of rest framework app
Merge branch 'gn20upgrade' of github.com:cga-harvard/cga-worldmap into gn20upgrade

Conflicts:
	geonode/settings.py