Cleanup debug code
Merge branch 'v3quick' of https://github.com/dualface/cocos2d-x into v3quick