Recovering from commit
Merge branch 'ssupgrade' of github.com:ging/vish into ssupgrade

Conflicts:
	app/assets/stylesheets/vish/conversation/_conversation.css.sass
	app/overrides/conversations/_conversation/replace_x_icon.html.erb.deface