Switch from html_safe to raw
Merge remote-tracking branch 'origin/master' into production

Conflicts:
	app/views/songs/show.html.erb