pep8
Add ability to create/edit custom location data
Remove unused old location edit view
wip
location cleanup
pep8
Add ability to create/edit location w/ custom data
Clear up unused stuff from old custom data form
Export custom location data
Refactoring Location export
Refactor location export to avoid duplicate calls
Merge remote-tracking branch 'origin/master' into custom_location_data

Conflicts:
	corehq/apps/locations/models.py
	corehq/apps/locations/util.py
	corehq/apps/locations/views.py
Properly export consumption dict on new domains

Previously if consumption dict was empty, no headers were exported
Fix consumption upload with new format
Enable bulk upload of custom location data
Merge remote-tracking branch 'origin/master' into custom_location_data

Conflicts:
	corehq/apps/locations/util.py
	corehq/apps/locations/views.py
Merge branch 'locations-for-everyone' into custom_location_data+locations-for-everyone

Conflicts:
	corehq/apps/hqwebapp/models.py
	corehq/apps/locations/util.py
	corehq/apps/locations/views.py
Make tests consistant with new column structure
Merge remote-tracking branch 'origin/master' into custom_location_data

Conflicts:
	corehq/apps/locations/forms.py
Merge branch 'custom_location_data' of github.com:dimagi/commcare-hq into custom_location_data