Merge branch 'master' into staging

Conflicts:
	corehq/apps/app_manager/static/app_manager/js/case-config-ui-2.js