snazzier slideshow editing interface
conflict cleanup in editor.js
Merge branch 'master' of https://github.com/punkave/apostrophe

Conflicts:
	public/js/editor.js