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 #5695: Update Facebook plugin test
Merge pull request #646 from VisualSJ/master

Issue #5695: Update Facebook plugin test