Merge branch 'master' into case-config

Conflicts:
	corehq/apps/app_manager/templates/app_manager/form_view.html
	corehq/apps/app_manager/util.py
	corehq/apps/app_manager/views.py
Merge pull request #483 from dimagi/case-config

Case config
Merge branch 'master' into staging2

Conflicts:
	corehq/apps/app_manager/templates/app_manager/form_view.html
	corehq/apps/app_manager/views.py