Merge branch 'ricky' into dev
Merge branch 'ricky' into dev
Update README.md
Update README.md
解决新用户的公信问题，同时在dashboard头像处加上了setting的链接
merge and test
Merge branch 'dev' into thy
增加了标签页的小图标，可以通过修改public/img/logo.png 更换
add profile page
add profile page
Merge branch 'dev' into thy
fix bugs
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev
回复发送信息
增加回复帖子后提醒帖子接受人的功能
 美化dashboard，message、forum修改了链接
add pictures
Merge branch 'thy' into dev
merge thy into dev
修正头像功能