Feature/admin groups

- Added a new column to /admin/users that displays the groups that the user belongs to
- Fixed the bug in /dashboard/ where the created by field did not correctly show the creators user name
- If you are viewing a query that you created it will now display the creator as your full name instead of just 'you'
- Pulled from master and fixed conflicts