Merge branch 'editing' into editing-aloha-fix

Conflicts:
src/scripts/helpers/backbone/views/editable.coffee