reset to old index
Merge branch 'staging' into staging-fix
event tracking for View button on Exchange
Merge branch 'master' into staging-fix
Merge branch 'exchange_view_button' into staging-fix
Revert "Merge branch 'case-integrity' into staging"

This reverts commit 9c88dd18742829bcfddbfe435e5b35fd59553017, reversing
changes made to 404edf5c13a3762fce36778a747a0036dfda0da4.

Conflicts:
	corehq/apps/cleanup/management/commands/check_case_integrity.py
tweak xform mapping
test preindex method
more print statements
Merge pull request #2264 from dimagi/worker_activity

Worker activity
Merge branch 'staging-fix' of github.com:dimagi/commcare-hq into staging-fix
more print statements
don't include docs for the XformPillow
Merge branch 'case-integrity' into staging-fix
tweak xform mapping
merge with case-integrity
Revert "Revert "Merge branch 'case-integrity' into staging""

This reverts commit a99377d6737c0afdbac20d1ccb49e028488846cb.
tweak xform mapping
Merge branch 'commtrack-makethehurtingstop' into staging-fix

Conflicts:
	submodules/casexml-src
	submodules/formdesigner
Merge branch 'staging-fix' of github.com:dimagi/commcare-hq into staging-fix