Revert "Merge pull request #2831 from dimagi/revert-vellum"

This reverts commit b3345eae872e9c3c3810ac2f78757a6523a0d6f2, reversing
changes made to 5be1de723d3563157dbe9d6aa4fbc58dca80376e.
Merge branch 'master' into vellum-includes

Conflicts:
	corehq/apps/app_manager/templates/app_manager/form_designer.html
Force stock on hand stuff to int
interpolate output refs for readable form view
Fix location coordinate importing
Overrided the es_result method and added the build_es_query method
allow user to toggle between readable and raw form data
allow user to show and hide questions not shown to the user
Merge branch 'master' into toggle-readable-raw

Conflicts:
	corehq/apps/reports/templates/reports/form/partials/single_form_tree.html
fix test to go along with new meaning for response=True
always show plan credits
Merge pull request #3299 from dimagi/better-get_questions-outputref

interpolate output refs for readable form view
Merge pull request #3300 from dimagi/plan-credit-fix

always show plan credits
Merge branch 'master' into toggle-readable-raw

Conflicts:
	corehq/apps/reports/formdetails/readable.py
use more semantic styling for form-data-skipped
added signal for refreshing fixtures in test domain
Merge pull request #3293 from dimagi/location-coord-import

Fix location coordinate importing
Merge pull request #3296 from dimagi/toggle-readable-raw

allow user to toggle between readable and raw form data
Merge pull request #3301 from SolDevelo/fixtures_signal

added signal for refreshing fixtures in test domain, removed task
gracefully handle bad/deleted locations in report filters

http://manage.dimagi.com/default.asp?111331