Merge remote-tracking branch 'origin/case-detail-tabs' into double-management+case-detail-tabs2

Conflicts:
	corehq/apps/app_manager/suite_xml.py
	corehq/apps/app_manager/tests/test_suite.py
fix bad merge
Merge remote-tracking branch 'origin/double-management' into double-management+case-detail-tabs2
Merge remote-tracking branch 'origin/case-detail-tabs' into double-management+case-detail-tabs2

Conflicts:
	corehq/apps/app_manager/tests/test_suite.py
Merge remote-tracking branch 'origin/master' into double-management+case-detail-tabs2
Merge branch 'double-management' into double-management+case-detail-tabs2

Conflicts:
	corehq/apps/app_manager/suite_xml.py
	corehq/apps/app_manager/tests/test_suite.py