同步下

同步下
Merge branch 'master' of https://github.com/huhuanming/motor

Conflicts:
	Moto.xcworkspace/xcshareddata/Moto.xccheckout