Added a few query lines to CMUser.php to handle user grouping.