Modify the parsing
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3

Conflicts:
	cocos/3d/CCSprite3D.cpp
Merge pull request #107 from liuliang2004/Meshv3

Meshv3
Merge branch 'newcode' into merge-bundle

Conflicts:
	cocos/3d/CCBundle3D.cpp