Merge branch 'thy' into dev
简单改进了team页面，优化了jointeam功能
Merge branch 'ricky' into dev
合并冲突
tiny bugs(team)
setting加入jquery效果；可以修改用户名
Merge branch 'ricky' into dev
Update README.md

update
Update README.md

补充说明
Merge branch 'dev' into thy