Merge branch 'master' into case-config

Conflicts:
	corehq/apps/app_manager/util.py
	corehq/apps/app_manager/views.py
fix One Time Survey not to have child cases
fix poor behavior when switching between form types
change text box size so case config works on small screens
Merge branch 'case-config' into staging2

Conflicts:
	corehq/apps/app_manager/views.py