article bugfix
add order detail view.
Merge remote-tracking branch 'beauty/master'
Merge pull request #64 from zhou5211/master

add order detail view.
Merge pull request #65 from majie1993/master

商品筛选
tabbar 个人中心 bug
fix article view image & font.
Merge remote-tracking branch 'beauty/master'
Merge pull request #66 from majie1993/master

商品收藏
Merge remote-tracking branch 'beauty/master'
add MBprogressHUD while http requesting.
Merge pull request #67 from zhou5211/master

add MBprogressHUD while http requesting.
Merge branch 'master' of https://github.com/joy32812/beauty