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
pXmlBuffer is not null terminated
do not retain target when regist frame event and movement event
when add a skin to last index, applay it's skindata to the previous skindata
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Fix compile warning
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
add setUserObject method to CCArmatureAnimation
optimize guireader
[master] Updating bindings-generator.
Merge pull request #4176 from dumganhar/master

[master] Updating bindings-generator.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4177 from CocosRobot/updategeneratedsubmodule_1384166661

[AUTO] : updating submodule reference to latest autogenerated bindings
add include path to fix compiling errors
Merge pull request #4180 from minggo/nacl-build

[ci skip]add include path to fix compiling errors
Merge pull request #4174 from nutty898/master_nutty_optimizeguireader

[ci skip]Master nutty optimizeguireader
Merge pull request #4167 from 2youyouo2/master

[ci skip]update armature