Merge pull request #94 from majie1993/master

修复brand字母bug
Merge pull request #95 from majie1993/master

修复filter中点击全部商品闪退
Merge pull request #96 from majie1993/master

文章评论bug+文章行高加高
provision file
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'
add brand index view at store page.
Merge pull request #99 from zhou5211/master

add brand index view at store page.
change alipay notifyURL.
Merge pull request #100 from zhou5211/master

add brand index view at store page.
修复退出登录点取消也退出的bug/修复个人中心设置点击保存闪退的bug
Merge remote-tracking branch 'beauty/master'
商城首页点击header置顶
Merge pull request #101 from zyuce/master

修复退出登录点取消也退出的bug/修复个人中心设置点击保存闪退的bug
商城点击header置顶