Merge branch 'AndrewLee' into Dev

Conflicts:

incommunit.xcworkspace/xcuserdata/wangliang.xcuserdatad/UserInterfaceSta
te.xcuserstate

incommunit.xcworkspace/xcuserdata/wangliang.xcuserdatad/xcdebugger/Break
points_v2.xcbkptlist
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYShoppingcart.m
	incommunit/Homepage/HomepageMain.m
	incommunit/Homepage/LYcertification.m