Merge branch 'AndrewLee' into Dev

Conflicts:
	incommunit/Base.lproj/Main.storyboard
	incommunit/Convenience/LYconvenienceMain.m
	incommunit/LYFunctionInterface.m
	incommunit/PropertyManagement/LYProManagementMain.m
	incommunit/Tools/LYToolsMain.m
	incommunit/UserLogin/LYaddCommunit.m