change the V3.0 add mac resources
change the V3.0 add mac resources
Merge branch 'master' of https://github.com/young40/CocoStudioSamplesBasedOnCocos2d-x3.0

Conflicts:
	DemoBag/Classes/CocosGUIExamplesEquipScene.cpp
	DemoBag/Resources/cocosgui/gui_examples/equip_1/equip_1.json
	DemoBag/Resources/hd/cocosgui/gui_examples/equip_1/equip_1.json