decorate login page
decorate the login page
merge thy
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev
test
merge
修复了joinTeam的不能弹出窗口的bug
修复了joinTeam关键bug，优化dashboard
增加了setting页面
Merge branch 'ricky' into dev
Update
完成推送