vellum changes
Merge remote-tracking branch 'origin/master' into vellum-requirejs

Conflicts:
	submodules/formdesigner
Fix broken submodule

Deploy to staging failed
Update formdesigner submodule

This was done because other people could not deploy staging. Related to this:

$ git submodule update
fatal: reference is not a tree: 861d86774c090af647670cdc48e52289ad6a48bc
Unable to checkout '861d86774c090af647670cdc48e52289ad6a48bc' in submodule path 'submodules/formdesigner'