李靖明
Merge branch 'master' of https://github.com/ourteamLemon/Rencuo

Conflicts:
	.DS_Store
	Rencuo.xcodeproj/project.pbxproj
	Rencuo/.DS_Store
	Rencuo/Main/Friends/FriendsListViewController.h