Modify the material parsing
Merge pull request #97 from liuliang2004/Meshv3

Modify the material parsing
modify render
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
merge bundle.
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle

Conflicts:
	cocos/3d/CCBundle3D.cpp
Merge pull request #98 from lvlonggame/merge-bundle

Merge bundle
load
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
create model
fixed some loading problems.
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
old model work
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
fix skeleton
for testing
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
animation is ok.
Merge pull request #99 from lvlonggame/merge-bundle

Merge bundle
draw sub mesh bug