代码更新
Merge branch 'master' of https://github.com/huayancreate/konka

Conflicts:

KONKA_MARKET/KONKA_MARKET/ViewController/BaseView/BaseViewXIB/HYOARetail
sTableViewCell.xib