for merge
rectify decoration bugs
Merge branch 'dev' of github.com:JYWa/teamstyle16 into server
修正队伍和找回密码的bug