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
make a mock ga function when in dev mode

and remove the ga undefined check from ga_track_event
make ga-tracked links respond to meta-click
fix View Source Files link behavior

expand gaTrackLink to allow delegating selectors
in addition to actual jquery objects
follow clicks even when ga is inaccessible
don't fail hard on errors in computed properties in domain metadata api

http://manage.dimagi.com/default.asp?148724
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
Use xmlns and app_id as key for multimedia export
Merge pull request #4919 from dimagi/project-meta-workaround

don't fail hard on errors in computed properties in domain metadata api
update staging.yaml

[ci skip]
Merge pull request #4743 from dimagi/custom-data-choices

Add choices to custom data fields
Merge pull request #4926 from dimagi/fix-multi-export

Use xmlns and app_id as key for multimedia export