Add choices to the Edit Custom Data Fields UI
add choices to edit UI
pep8
Add choices validation to upload validator
Fix template
Merge remote-tracking branch 'origin/master' into custom-data-choices
Enable the submit button on choice field deletion
Merge branch 'master' of github.com:dimagi/commcare-hq into custom-data-choices
Stick custom data fields behind a toggle
Merge branch 'master' of github.com:dimagi/commcare-hq into custom-data-choices

Conflicts:
	corehq/toggles.py
Merge pull request #4743 from dimagi/custom-data-choices

Add choices to custom data fields