commit by chaoweili
Merge branch 'master' of https://github.com/TeamOfFBAuto/FBAuto

Conflicts:
	FBAuto/FBAuto.xcodeproj/project.pbxproj
	FBAuto/FBAuto.xcworkspace/xcshareddata/FBAuto.xccheckout