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
Mouse working on mac
Implement mouse callback for windows
Add some comments for mouse scorlling function
Add mouse support to linux
issue #3037:Add assetsmananger lua binding and a releated test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
issue #2771: implement contact callbacks
include climits for UINT_MAX
Merge branch 'fix_inclusion_phys'