Merge remote-tracking branch 'origin/master' into custom_user_data
Genericize field data type representation
Merge remote-tracking branch 'origin/custom_user_data' into custom_product_data

Conflicts:
	corehq/apps/commtrack/bulk.py
Update Product Fields with label changes
Don't 500 on keys with spaces
fix page name
Remove subscription dependency for custom user data
Remove extra header
Warn user when deleting a custom field definition
Correct typo (and rename it anyway)
Disable submit button before changes are made
Prevent xml errors in the property name
Generate unique ids for the delete modals
Merge pull request #4443 from dimagi/custom_product_data

Custom product data
Merge branch 'custom_user_data' of github.com:dimagi/commcare-hq into custom_user_data

Conflicts:
	corehq/apps/custom_data_fields/views.py
wip
Merge branch 'master' of github.com:dimagi/commcare-hq into custom_user_data

Conflicts:
	corehq/apps/commtrack/views.py
Drag-n-drop correctly
Revert "wip"

This reverts commit 0a08c1841affcd4192507f81758a96ae97c415da.
Validate custom user data on upload