change armature version
change ColliderFilter param type
change ColliderFilter param type
fixed alpha effect
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
1.add TEST_EASING
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
fixed create PhysicsSprite
fix collider Synchronization
fix2d compling warning
1.change blendfunc method
2.support custom easing
fixed change animation internal, animation speed not right
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
change Array to Vector
change Array to Vector, Dictionary to Map
Merge branch 'newRenderer' into Array

Conflicts:
	cocos/editor-support/cocostudio/CCArmature.cpp
	cocos/editor-support/cocostudio/CCArmature.h
	cocos/editor-support/cocostudio/CCBatchNode.cpp
	cocos/editor-support/cocostudio/CCColliderDetector.cpp
	cocos/scripting/auto-generated
	tools/bindings-generator
fixed compiler error
Merge branch 'develop' into Array

Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
change for iterator and callfunc
fixed compile error
change play arguments