Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
add some tips for test-cases
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #537 from pandamicro/master

Release #5636: Fix bugs
fixed Conflicts
no message
Release #5636: Update engine version
Merge pull request #538 from wuzhiming/master2

add some tips for facebookTest
Release #5636: Update authors
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Release #5636: Update html5 engine