klk

khj
Merge branch 'master' of https://github.com/FBLife/FBCircle

Conflicts:
	FBCircle/FBCircle.xcodeproj/project.pbxproj
	FBCircle/publicImages/fabiao/faceicon-56_56@2X.png
	FBCircle/publicImages/fabiao/表情-icon-56_56@2X.png
	FBCircle/publicImages/fabiao/表情-icon-56_56@2x.png
.,

jk