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

Conflicts:
	app/assets/javascripts/slide_cloud.js.coffee
Merge branch 'joh' of github.com:johdirr/SlideCloud into joh
i dont know
Merge branch 'joh' of github.com:johdirr/SlideCloud into joh

Conflicts:
	app/templates/slideshows/index.mustache