Merge pull request #163 from dimagi/vellum-languages-warning

Vellum languages warning
Merge pull request #164 from dimagi/cz

fix more type-switching bugs
Merge pull request #81 from mwhite/release

version 1.5.0
Merge pull request #170 from mwhite/master

merge master of mwhite/Vellum
Merge branch 'master' into develop
Revert "Merge pull request #170 from mwhite/master"

This reverts commit 67f7ff57d049c5914de318d01fbb627d4b3378d5, reversing
changes made to 824b815b0844827bb72788e41ea0a7d037c37fea.
Merge pull request #171 from dimagi/revert-vellum

Revert "Merge pull request #170 from mwhite/master"
Revert "Merge pull request #171 from dimagi/revert-vellum"

This reverts commit cc912ed04a4b089f728efcb9354e02c2006c9d0b, reversing
changes made to 488728c1cca8006f16759119e0bde8a9d30726ad.
Revert "fix issue with mug.parentMug"

This reverts commit ffecf2158023ce8610128476e3dab6939ce72cc6.

Conflicts:
	dist/vellum.min.js
refactoring to undo the previous revert of a fix

This refactors some stuff in the question adding methods.  One effect is
that questions are no longer added based on the currently-selected mug,
instead it's explicitly passed.  This should make loading a form faster.
Merge pull request #82 from mwhite/fix

fix issue in previous release
Merge branch 'develop' of github.com:dimagi/Vellum into develop
fix issue on empty forms
Merge branch 'develop'
Merge pull request #172 from mwhite/master

fix issue in previous release
temporarily revert to state at e265056 for testing
temporarily revert to state at e265056 for testing
Revert "temporarily revert to state at e265056 for testing"

This reverts commit 0bdc2d38a447b9cb17a82ee0c718e7a38ddec271.
working travis config?
un-nest a closure