upload CCArmatureDefine.cpp
fix setcolor
fix add display
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
remove cc
Add AppCode project files to ignorelist
Implement MouseWheel Event, also fix a typo in EventListener interface
Implement Mouse_up Mouse_down and Mouse_Move
issue #2771:  add updatePhysicsTransform to Node.
Mouse working on mac
Implement mouse callback for windows
Add some comments for mouse scorlling function
issue #2771:  change angular damping to moment. (these two have different meaning, change to the correct one)
issue #2771:  add addMass() and addMoment() to body.
issues #2905:Updating project configuration for folder change.
issue #2771: migrate the PhysicsShape definition
issue #2771: migrate the PhysicsBody definition
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop