upload CCArmatureDefine.cpp
fix setcolor
fix add display
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
remove cc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	extensions/Android.mk
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop

Conflicts:
	extensions/CocoStudio/Armature/CCArmature.cpp
	extensions/CocoStudio/Armature/CCBone.cpp
	extensions/CocoStudio/Armature/CCBone.h
	extensions/CocoStudio/Armature/display/CCDisplayManager.cpp
	extensions/CocoStudio/Armature/display/CCSkin.cpp
	extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp
fix add display
update develop
upload resource
update develop
upload resource
1. fix if frame event is at the last frame, it may emit event several times
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
upload resource
1.add method to set collider filter
issue #2771: finish OneWayPlatform demo and fix some bugs
issue #2771: delay load
1. change color json format
2. fix tween easing
3. fix CCBone crate bug
fix compile error
1. Change NULL to null
2. Remove CocoStudio/Armature files