cleanup
Merge branch 'v3quick' of github.com:dualface/cocos2d-x into v3quick
move