Viks merge group by into the cogwheel task#17737

This acomplishes Squish Task[#17737]: Merge group by into the cogwheel
http://squish.ish.com.au/tasks/17737
The "Group by" options list has been moved inside the cogwheel.