Merge branch 'master' into staging

Conflicts:
	(NOT RESOLVED) corehq/apps/app_manager/static/app_manager/js/case-config-ui-2.js
don't know how to merge the file below -- leave the staging HEAD version in place but the merge conflicts in the file, commented out, for simon to resolve

Merge branch 'staging' of github.com:dimagi/commcare-hq into staging

Conflicts:
	corehq/apps/app_manager/static/app_manager/js/case-config-ui-2.js
Merge branch 'staging' of github.com:dimagi/commcare-hq into staging

Conflicts:
	corehq/apps/app_manager/static/app_manager/js/case-config-ui-2.js
fix submodule ref that was lost in merge