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

Conflicts:
	KONKA_MARKET/KONKA_MARKET/UI/Universal/Default-568h@2x.png
	KONKA_MARKET/KONKA_MARKET/UI/Universal/Default.png
	KONKA_MARKET/KONKA_MARKET/UI/Universal/Default@2x.png