完成
xx
Merge branch 'master' of https://github.com/opop369a/Vanilla2.0

Conflicts:
	Vanilla_2.0.xcworkspace/xcshareddata/Vanilla_2.0.xccheckout