Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
fix CCString to lua string

rt
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
pXmlBuffer is not null terminated
fixed ui action will be wrong while loop play
resloved merge error
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
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
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