修改邻里互助
Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/UserLogin/LYUserloginView.m
	incommunit/UserLogin/LYaddCommunit.m
修改自动登陆逻辑
Merge branch 'AndrewLee' into Dev
Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYconvenienceMain.m
添加我的订单
小修改
修改bug
修改登陆模块  修改周边便民模块
Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit.xcodeproj/project.pbxproj
	incommunit/Base.lproj/Main.storyboard
	incommunit/Homepage/LYHomeMyOrder.h
	incommunit/Homepage/LYHomeMyOrder.m
修改冲突代码
修改冲突
修改周边便民
Merge branch 'AndrewLee' into Dev
修改周边便民
Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/Convenience/XIB/LY_DeliveryCell.m
	incommunit/LYFunctionInterface.h
	incommunit/LYFunctionInterface.m
修改用户表结构
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Convenience/XIB/LY_DeliveryCell.m
	incommunit/Convenience/XIB/SubmitOrderItemView.m