changes the mysql query for displaying people in staffgroups 2 and 3 -- previously, the order in which the AND and OR statement were considered was incorrect. (#170)
Merge branch '1.2.7' into former_employees