Merge branch 'master' into double-management
use differnet case_id session var for autogen ID
add case list form app strings
use autogen case id in form
add module selection before form selection
Merge branch 'double-management' into double-management+case-detail-tabs

Conflicts:
	corehq/apps/app_manager/suite_xml.py
Merge branch 'double-management+case-detail-tabs' into autostaging
Merge remote-tracking branch 'origin/ptop-reindex' into autostaging
Merge remote-tracking branch 'origin/historical-forms' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge remote-tracking branch 'origin/revert-4205-revert-3841-86347-2' into autostaging
Merge remote-tracking branch 'origin/masterlist-workflow' into autostaging
Merge branch 'bulk-app-translate' into autostaging
Merge remote-tracking branch 'origin/share-fixtures' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/custom-data-choices' into autostaging
Merge branch 'export-user' into autostaging
Merge remote-tracking branch 'origin/vellum-jquery-upgrade' into autostaging
Merge remote-tracking branch 'origin/vellum-staging' into autostaging