upload CCArmatureDefine.cpp
fix setcolor
fix add display
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
remove cc
fix tolua_fix, cleanup peertable after object deleted
android & ios screen size change support
issue #2771: implement contact callbacks
issue #2771: fix some retain/release bugs
issue #2771: edit physics effect with all bodies and fix some bugs
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
issue #2771: add physics pump demo and fix bugs
config android_mk_generator
update develop
upload resource
update develop
upload resource
issue #2771: edit listener