chaoweili

sync
Merge branch 'master' of https://github.com/TeamOfFBAuto/FBAuto

Conflicts:
	FBAuto/FBAuto.xcworkspace/xcshareddata/FBAuto.xccheckout