Cleanup
Merge branch 'master' into post-view

Conflicts:
	app/assets/javascripts/controllers/stream_controller.js.coffee
	app/assets/javascripts/templates/stream_post.hbs