Merge pull request #3922 from dumganhar/develop

[Win32] Fixing compilation errors after renaming 'CocosDenshion' to 'audio'.
Make the plugin be compatible with both cocos2d-x-2.2 & cocos2d-x-3.0.
issue #2905:adjust folder structure
fix conflicts
Merge pull request #3926 from minggo/iss2905-adjust_folder

adjust folder structure
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3925 from natural-law/develop

Update the status of submodule plugin
issue #2905: add missing files
issue #2905:use - to connect multiple words
issue #2905: step1 Box2D -> box2d
issue #2905: step2 Box2D -> box2d
Merge pull request #3928 from minggo/iss2905-adjust_folder

adjust folder
issue #2905: remove rpm, don't support qt5 temporaly
issue #2905:remove box2d
issue #2905:add Box2D
Merge pull request #3930 from minggo/iss2905-adjust_folder

adjust folder
Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder.