Added comments to replies and presentations
Merge branch 'master' into comments

Conflicts:
	app/controllers/replies_controller.rb
	app/models/ability.rb
	app/views/replies/_reply.html.erb
	app/views/surveys/_survey.html.erb
	db/schema.rb
Dashboard partial renamed to panel...
Merge branch 'comments'

Conflicts:
	app/views/news/show.html.erb