Merging 'fe-devenv' into latest 'geonode2-integration'

Conflicts:
	openquakeplatform/setup.py