Merge branch 'master' into eventstream-paper-to-user-channels

Conflicts:
	app/models/comment.rb