Merge remote-tracking branch 'origin/fields-to-filters' into attrib-fixture+fields-to-filters
Update fields import location
remove new field
Merge branch 'fields-to-filters' of github.com:dimagi/commcare-hq into attrib-fixture+fields-to-filters
Merge branch 'attrib-fixture+fields-to-filters' of github.com:dimagi/commcare-hq into attrib-fixture+fields-to-filters