Merge pull request #1 from cocos2d/master

Synchronize from upstream
Added prefix for resources and js files.
Merge pull request #2 from dumganhar/master

Added prefix for resources and js files.
Use relative path for watermelon_with_me.
Merge pull request #3 from dumganhar/master

Use relative path for watermelon_with_me.
Merge branch 'master' of https://github.com/Wu-Hao/cocos2d-html5-tests
CocosDragon works on 640x900 on Mac
Merge remote-tracking branch 'vlidholt/master'
Watermelon resource fixes

using correct case for png files for html5
Watermleon resoruce fixes

another html5 resource with case mismatch
Reverted resource path to only containing a file name. All resources in WatermelonWithMe need to be copied into one folder('assets' on android), that means no other folders in assets folder.
Merge pull request #4 from dumganhar/master

WatermelonWithMe need to be copied into one folder('assets' on android), that means no other folders in assets folder.
Reverted the resource tree of cocos2d-js-tests/tests.
Merge pull request #5 from dumganhar/master

Reverted the resource tree of cocos2d-js-tests/tests.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests.git
synchonize to up-stream
Merge pull request #6 from minggo/synchronize-upate-stream

Synchronize up stream codes
Merge branch 'master' of https://github.com/minggo/cocos2d-js-tests
audio bug
fixed #1509 correct anchorPoint for TMXIsoObjectsTest and TMXOrthoObjectsTest