Merge mobile point interface and geojson changes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	geoq/core/static/core/js/aoi_feature_edit.js