potali-5-1 comment_helper fixed
potali-5-1 flags_count to questions added
Merge branch 'potali-5-1' of https://github.com/mdk199/rorproject into potali-5-1
Merge branch 'master' of https://github.com/mdk199/rorproject

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/mdk199/rorproject into potali-activity-log

Conflicts:
	db/schema.rb
datatable added