add waitOn to team route, clean up routes
code cleanup
users page: standard formatting, fix users list / filter, remove 'info' column, only show 'add team' column if canEdit
resolve merge conflicts