Merge branch 'editing' into editing-refactor

Conflicts:
src/scripts/models/contents/collection.coffee