changes to the user and team queries
Merge branch 'master' of https://github.com/david-bergeron/SchedulerAlerts
updating the user and team queries