improve comment styling and action buttons within comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/comments/_comment.html.erb
Improve layout of comment & comment action buttons