changed to html safe in event's show view
Merge remote-tracking branch 'origin/master'