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

Conflicts:
	KONKA_MARKET/KONKA_MARKET/Model/HYUserLoginModel.h
	KONKA_MARKET/KONKA_MARKET/Model/HYUserLoginModel.m