Merge pull request #4951 from houguohua/3d-extension

model
Merge pull request #4963 from houguohua/3d-extension

resource system
Merge branch '3d-extension' of github.com:cocos2d/cocos2d-x into 3d-extension
3d compile ok