Problem around data grid sorting refs  #522
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/views/groups/index.html.erb
	app/views/users/_users.html.erb