format code
Merge branch 'newcode' into merge-bundle

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

format code