added back the filter function
small format change
Merge pull request #340 from LI-HE/master

added back the filter function
change back
Merge pull request #341 from LI-HE/master

change back
change back #2
Merge pull request #342 from LI-HE/master

change back #2
Updating Tournament controller
Merge pull request #343 from ruijunhuang2010/master

Merge pull request #52 from ChrisBoesch/master
Merge pull request #53 from ChrisBoesch/master

update