Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #691 from pandamicro/master

Issue #5781: Add search path for plugin-x bindings
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
Closed #5781: update the reference of cocos2d-html5
Merge pull request #693 from dingpinglv/Iss5781_V3rc2

Closed #5781: update the reference of cocos2d-html5
Issue #5781: Update read me
Update -x to fix downloader issue
Issue #5781: Add cc.formatStr