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
temp commit modify
remove unneed codes
Modify touch method.
Merge pull request #4126 from minggo/master

[ci skip]fix some compiling errors on iOS
Move file info storer from uihelper to guireader
Merge branch 'master' into master_nutty_modifywindowspj
temp commit modify
add "setUserObject" method
Merge pull request #4139 from nutty898/master_nutty_adjustframework

Master nutty adjustframework
Rename event interface
Merge branch 'master' into master_nutty_adjustframework
add listviewex event
optimize layout
modify layout
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