fix warning
Issue #2416: modify some code to let tests works.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into Iss2416_Renderer
Issue #2416: remove a superfluous testcase of LayerTests
Fixed #2416: update the reference of cocos2d-html5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into Iss2416_Renderer
Merge pull request #1170 from cocoscodeide/develop

fix warning
Add missing constants which result in errors in js-test/SpriteTest
Use another logo url
Fix memory leak of JSJavaBridge
Fix build_native.py adding NDK_TOOLCHAIN_VERSION
binding-generator supports ndk r10
Merge pull request #1180 from dingpinglv/Iss2416_Renderer

Fixed #2416: modify some code to let tests works.
Merge pull request #1186 from joshuastray/develop-6

binding-generator supports ndk r10
Merge pull request #1182 from joshuastray/develop-3

Use another logo url
Merge pull request #1181 from joshuastray/develop

Add missing constants which result in errors in js-test/SpriteTest
Merge pull request #1185 from joshuastray/develop-5

Fix build_native.py adding NDK_TOOLCHAIN_VERSION
Merge pull request #1184 from joshuastray/develop-4

Fix memory leak of JSJavaBridge
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop

Conflicts:
	samples/js-tests/src/TextureCacheTest/TextureCacheTest.js
Fixed JSObjCBridge's issue with string return value