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
Update submodule now that develop is merged!

QA passed, YAY!
Merge remote-tracking branch 'origin/master' into vellum-includes
Merge pull request #3311 from dimagi/vellum-includes

Vellum includes