Merge branch 'develop' of github.com:dimagi/Vellum into temp-fix
fix #86: Edit expression panel is displayed even after deleting Question

introduced in b0ec68
fix #90: question label changing doesn't work
Merge branch 'temp-fix' into develop

Conflicts:
	dist/vellum.min.js