Comments grid extended

Added sortable, filterable and method settings for columns in the grid
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/controllers/comments-controller.js