xuwei
Merge branch 'master' of https://github.com/huayancreate/konka

Conflicts:

KONKA_MARKET/KONKA_MARKET/ViewController/LoginView/HYLoginViewController
.xib
xuwei