Added some more filtering options for team averages.
Merge origin/master