Merge branch 'develop'
Fix broken XML serialization
Merge pull request #215 from dimagi/112278-replace-nbsp

Fix broken XML serialization
Merge remote-tracking branch 'origin/master' into develop

Rebuilt vellum.min.js

Conflicts:
	dist/vellum.min.js