Merge branch 'tests_js_3.0' of https://github.com/cocos2d/cocos2d-js-tests into tests_js_3.0_ccgame

Conflicts:
	tests/ActionsTest/ActionsTest.js
	tests/OpenGLTest/OpenGLTest.js
	tests/PerformanceTest/PerformanceSpriteTest.js
	tests/PerformanceTest/PerformanceTextureTest.js
	tests/tests-main.js