Fix Issue 935 (Grouping)

Add grouping functionality to the grid