Refactored out some params
Fixed all false repeats in edit to nil
Merge branch 'master' of https://github.com/panjiw/Team-Player
Merge branch 'master' of https://github.com/panjiw/Team-Player