modify
Merge branch 'listview' of https://github.com/htlxyz/cocos2d-x into listview