Merge branch 'master' into staging2

Conflicts:
	submodules/casexml-src
Merge branch 'case-config' into staging2

Conflicts:
	corehq/apps/app_manager/views.py