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
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts Vector::eraseObject, not need to return iterator.
Merge pull request #4507 from dumganhar/del-vector-foreach

Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
Merge pull request #4508 from CocosRobot/updategeneratedsubmodule_1387273832

[AUTO] : updating submodule reference to latest autogenerated bindings
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