Merge branch 'master' of https://github.com/joy32812/beauty
Merge pull request #93 from zhou5211/master

cart/product detail/product comment.
修复brand 字母显示的bug
Merge branch 'master' of https://github.com/joy32812/beauty
Merge pull request #94 from majie1993/master

修复brand字母bug
修复filter中点击全部商品闪退
Merge pull request #95 from majie1993/master

修复filter中点击全部商品闪退
文章评论一次两条bug修复
文章修改行高为120%
删除相关商品处的输出
Merge pull request #96 from majie1993/master

文章评论bug+文章行高加高
provision file
商品评论bug修复
Merge pull request #97 from majie1993/master

商品评论bug修复
商场一天请求一次/去调商品详情tablebar/username替换nickname
fix-conflicts
修改头像后立即显示
Merge pull request #98 from zyuce/master

商场一天请求一次/去调商品详情tablebar/username替换nickname/修改头像后立即显示
.
Merge remote-tracking branch 'beauty/master'