Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change tab to 4 space
Merge pull request #3817 from Dhilan007/master

[ci skip]fix compile fail on vs2010
change definition to pointer
change tab to 4 space
Merge pull request #3818 from Dhilan007/master

[ci skip]fix the bug that Tint and Fade action can't work for ProgressTimer.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3801 from 2youyouo2/master

[ci skip]update armature
Merge pull request #3819 from CocosRobot/updategeneratedsubmodule_1380114859

[AUTO] : updating submodule reference to latest autogenerated bindings
fix run build-win32.bat build fail