work at editor
merged stuff more work at editor

Merge branch 'joh' of github.com:johdirr/SlideCloud into joh

Conflicts:
	app/templates/slideshows/index.mustache