chengzhitong

164458
Merge branch 'master' of https://github.com/4SSTORE/HEHE

Conflicts:
	4SStores/4SStores/Base.lproj/Main.storyboard