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
fixed Conflicts
no message
Merge pull request #538 from wuzhiming/master2

add some tips for facebookTest