赵逸飞合并前准备
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/AppDelegate.cpp
	Classes/StartScene.cpp
	Classes/UILayer/ShopGiftLayer.cpp