qw

qw
Merge branch 'master' of https://github.com/chenshipeng/eliuyan

Conflicts:
	ELiuYan12/ELiuYan.xcodeproj/project.pbxproj

ELiuYan12/ELiuYan.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserd
atad/UserInterfaceState.xcuserstate
	ELiuYan12/ELiuYan/MainVC/MainViewController.m

ELiuYan12/ELiuYan/MainVC/MemberVC/MemberDetailVC/AboutUsViewController.m
	ELiuYan12/ELiuYan/MainVC/ShoppingVC/StoreDetailViewController.m