Merge pull request #779 from dingpinglv/develop

Merge develop to master branch
Updates cocos2d-html5's reference.
Merge pull request #781 from dingpinglv/develop

Updates cocos2d-html5's reference.
Merge pull request #782 from dingpinglv/develop

Merge develop to master branch
Merge branch 'chipmunk' of https://github.com/joshuastray/cocos2d-js into chipmunk
query test compatible with touch event and convert tab to 4 spaces