modify for compress
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
Code Standards
Merge branch 'newcode' into v3

Conflicts:
	cocos/3d/CCBundle3D.cpp
modify log
remove 0.3 branch logic
Merge pull request #120 from lvlonggame/v3

modify some logs and code standards