fix comments
fix comments

Conflicts:
	app/views/articles/show.html.erb
	app/views/comments/_edit.html.erb
	app/views/comments/_subcomment.html.erb
	app/views/comments/create_success.js.erb
	app/views/comments/edit.js.erb