Merge pull request #884 from dingpinglv/develop

Update the reference of cocos2d-html5
simulator Resolution
Merge pull request #886 from VisualSJ/develop-rc

simulator Resolution
fix arguments bug
Merge pull request #888 from joshuastray/develop

fix arguments bug
Update the reference of cocos2d-html5