light mask
remove unused resource
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
fix wp8 directory control bug
Merge pull request #8106 from super626/v3

add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
Merge pull request #8109 from andyque/fixTests

fix editbox test
fix wp8 directory control bug --modify
Merge pull request #8108 from huangshiwu/v3_wp8test

fix wp8 directory control bug
[ci skip]
Update the reference of submodule cocos2d-console.
[ci skip]
Merge pull request #8110 from natural-law/v3

Update the reference of submodule cocos2d-console.
[ci skip]update version info
fix compile on ubuntu.
fix.
Merge pull request #8093 from wohaaitinciu/v3_WebView_win32

web view win32
[ci skip]
[AUTO][ci skip]: updating cocos2dx_files.json
[ci skip]
Merge pull request #8112 from CocosRobot/update_cocosfiles_1411349538

[AUTO][ci skip]: updating cocos2dx_files.json