Merge branch 'master' into cm-vellum

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

This merge is better than the one I did on the staging branch
Merge branch 'cm-vellum' into staging

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