Merge branch 'Dev' into AndrewLee
邻里互助增加弹出框
Merge branch 'Dev' into AndrewLee
修改我的店铺 店铺设置
界面调整
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/LYSelectCommunit.m
	incommunit/UserLogin/LYUserloginView.m
Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/LYSelectCommunit.m
	incommunit/UserLogin/LYForgotPassword.m
	incommunit/UserLogin/LYaddCommunit.m