Configured comment reply and draft displays
Merge branch 'master' into janice_style

Conflicts:
	app/assets/stylesheets/application.css.scss