fix duplications
Merge branch 'master' of github.com:hatoishi/squad