Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
issue #5804: fix the bug of empty folder not being copied in plugin-x
Merge pull request #692 from joshuastray/master

issue #5804: fix the bug of empty folder not being copied in plugin-x