Merge pull request #13 from cocos2d/master

Updated with upstream.
Merge pull request #14 from cocos2d/master

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

Updated with upstream.
Merge pull request #16 from cocos2d/master

Updated with upstream.
Merge pull request #20 from cocos2d/master

Updated with upstream.
Merge branch 'master' of https://github.com/shujunqiao/cocos2d-js-tests
modify cocosDenshion(multiresolution is not solved).