Merge branch 'Dev' into AndrewLee
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/LYSelectCommunit.m
	incommunit/UserLogin/LYUserloginView.m
修改关于用户和小区的部分相关
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Sqllite/LYSqllite.m
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/LYFunctionInterface.m
	incommunit/LYSelectCommunit.m
	incommunit/Sqllite/LYSqllite.m
	incommunit/UserLogin/LYForgotPassword.m
	incommunit/UserLogin/LYUserloginView.m
添加user_id属性
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Homepage/LYMyCommunit.m
	incommunit/LYFunctionInterface.m
	incommunit/LYSelectCommunit.m
	incommunit/Sqllite/LYSqllite.m
	incommunit/UserLogin/LYForgotPassword.m
	incommunit/UserLogin/LYUserloginView.m
	incommunit/UserLogin/LYaddCommunit.m
修改登录页面输入框bug
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Homepage/LYMyCommunit.m
	incommunit/LYFunctionInterface.m
	incommunit/LYSelectCommunit.m
	incommunit/Sqllite/LYSqllite.m
	incommunit/UserLogin/LYForgotPassword.m
	incommunit/UserLogin/LYUserloginView.m
	incommunit/UserLogin/LYaddCommunit.m
部分权限修改，错别字修改
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Homepage/LYMyCommunit.m
	incommunit/LYSelectCommunit.m
	incommunit/NCMainViewController.m
	incommunit/Sqllite/LYSqllite.m
	incommunit/UserLogin/LYForgotPassword.m
	incommunit/UserLogin/LYUserloginView.m
	incommunit/UserLogin/LYaddCommunit.m
权限设置
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Homepage/LYMyCommunit.m
	incommunit/LYFunctionInterface.m
	incommunit/LYSelectCommunit.m
	incommunit/Sqllite/LYSqllite.h
	incommunit/Sqllite/LYSqllite.m
	incommunit/UserLogin/LYUserloginView.m
修改成为小区用户页面bug
修改逻辑bug
修改获取当前小区和选择小区的方式
Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Homepage/LYMyCommunit.m
	incommunit/LYFunctionInterface.m
	incommunit/LYSelectCommunit.m
	incommunit/Sqllite/LYSqllite.m
Merge branch 'Dev' into AndrewLee
修改弹出框
微调商店，购物车