Merge branch 'master' into jqueryUI-update
Allow text input
Merge branch 'jqueryUI-update' into batch_editing