fix bugs
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev