Update comments UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/comments/_comment.html.erb
	app/views/posts/show.html.erb