同步
Merge branch 'master' of https://github.com/stonesun1314/FlyingDragon

Conflicts:
	Flying Dragon/Flying
Dragon.xcodeproj/project.xcworkspace/xcshareddata/Flying
Dragon.xccheckout