Merge branch 'AndrewLee' into Dev

Conflicts:
	.gitignore

incommunit.xcworkspace/xcuserdata/wangliang.xcuserdatad/xcdebugger/Break
points_v2.xcbkptlist
	incommunit/Convenience/LYShoppingcart.m
	incommunit/Homepage/LYcertification.h
	incommunit/Homepage/LYcertification.m