conflict
Merge branch 'master' of http://github.com:/yulapps/minsport
Merge branch 'master' of http://github.com:/yulapps/minsport
fix
Merge branch 'master' of http://github.com:/yulapps/minsport
fix