更新
解决冲突

This reverts commit 42b37af77568c6cc3f4dc9d172245571ad45ebca.

Conflicts:
	TheStoreApp.xcodeproj/project.pbxproj

TheStoreApp.xcodeproj/project.xcworkspace/xcuserdata/Apan.xcuserdatad/Us
erInterfaceState.xcuserstate
	TheStoreApp/Controllers/YWBaseViewController.m
	TheStoreApp/Controllers/YWHomeViewController.m