Merge branch 'newindicator' of github.com:SEL-Columbia/commcare-hq into newindicator

Conflicts:
	custom/_legacy/mvp/static_definitions/couch/chw_visits.py
Merge branch 'newindicator' of github.com:SEL-Columbia/commcare-hq into newindicator

Conflicts:
	custom/_legacy/mvp/static_definitions/couch/chw_visits.py