Use apos.on, not $('body').on, for apostrophe-wide events
Merge branch 'master' of http://github.com/punkave/apostrophe-editor-2

Conflicts:
	public/js/editor.js