Fix placeholder text for default languages
Merge pull request #272 from dimagi/fix-placeholder

Fix placeholder text for default languages
Fix bug in output ref renaming
Make failing test output readable
Fix broken test: \w is not equivalent to \\w

...in a JavaScript string.
Merge pull request #273 from dimagi/147618-output-ref-update-bug

Fix bug in output ref renaming
Do not convert label value to placeholder
Avoid event.altKey if event not provided

Also refine message.
Merge pull request #274 from dimagi/small-fixes

Small fixes
Merge pull request #265 from dimagi/jstree-drag-drop-bug

Fix jstree drag drop bug (upgrade to v3.0.6)
Fix broken test
Make label itext placeholders stay in sync
Cleanup itextLabelWidget itext accessors
Minor cleanup
Fix broken tests
Put space between icon and text in multimedia button groups
Merge pull request #275 from dimagi/fix-placeholder

Make label itext placeholders stay in sync
Merge pull request #276 from dimagi/button-text-spacing

Put space between icon and text in multimedia button groups
Merge branch 'master' into 146611-bulk-trans-newline

Conflicts:
	tests/javaRosa.js
Merge branch '146611-bulk-trans-newline' into staging