Merge branch 'Dev' into AndrewLee

Conflicts:
	incommunit/LYSelectCommunit.m
	incommunit/UserLogin/LYUserloginView.m