addd method changeDisplayByName
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed movement event
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
1.update TEST_COLLIDER_DETECTOR
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change draw type
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
remove unused code
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
change armature version
add play serveral movement function
1.add play function
2.add TEST_PLAY_SEVERAL_MOVEMENT
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'changeDisplayByName'

Conflicts:
	extensions/CocoStudio/Armature/datas/CCDatas.h
	extensions/CocoStudio/Armature/display/CCDisplayFactory.cpp
	extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

Conflicts:
	extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp
revert submo
revert  submodule link