Merge pull request #8 from cocos2d/master

Synchronize from upstream
Merge pull request #9 from cocos2d/master

Synchronize from upstream
Merge pull request #10 from dumganhar/master

Synchronizing to the latest cocos2d-js-test
Merge pull request #11 from dumganhar/master

Synchronizing to the latest cocos2d-js-test
Merge pull request #12 from dumganhar/master

Synchronizing to the latest cocos2d-js-test
Merge branch 'master' of https://github.com/minggo/cocos2d-js-tests