merge bundle
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