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

Conflicts:
	KONKA_MARKET/KONKA_MARKET/ViewController/.DS_Store
	KONKA_MARKET/KONKA_MARKET/ViewController/HomeView/.DS_Store