Merge pull request #182 from linshun/master

issue #2580: fixed typo
issue #2355 add active for Bomb\Coin\EndCoin
fixed #2355  modify ySpeed of Dragon
fixed #2355 add preSet for Explosion
issue #2355 add preSet forExplosion
issue #2299 add ArmatureTest
fixed #2294 Actions which calls copy() now calls clone() instead
Merge branch 'master' of cocos2d-js-test into Iss2294_MigrateActionClasses

Conflicts:
	games/MoonWarriors/src/SparkEffect.js
	tests/SpriteTest/SpriteTest.js
fixed #2294 Actions which calls copy() now calls clone() instead
Merge pull request #183 from xingsenma/CocosDragonJS

Fixed #2355 Improve CocosDragon performance for mobile browsers
Fixed #2299 add armature examples
Fix the single page version of cocos2d-js-tests til the point that PerformanceSpriteTest can be run.
Use languageIn="ECMASCRIPT5" seems better.
Fixed #2295 Modify RenderTextureTest for latest version of RenderTexture
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss2295_Migrate3DEffects
Merge pull request #187 from dingpinglv/Iss2295_Migrate3DEffects

fixed #2295 RenderTextureTest  has been Modified for latest version of RenderTexture
Merge pull request #186 from oupengsoftware/taskbranch/COCOS2D-48

Fix the single page version of cocos2d-js-tests til the point that PerformanceSpriteTest can be run.
Merge pull request #185 from xingsenma/Armature

Fixed #2299: Integrated armature module
Merge pull request #184 from dingpinglv/Iss2294_MigrateActionClasses

fixed #2294 Actions which calls copy() now calls clone() instead
fixed #2297 Migrate MenuTest to Cocos2d-x v2.1.4