Fixes Bug 914816 - Changes to the GROUP BY rules for device summary, and reordering the columns per KaiRo's request.
Merge pull request #1488 from brandonsavage/bug914222devices

Fixes Bug 914816 - Changes to the GROUP BY rules for device summary, and reordering the columns per KaiRo's request.