Merge from cocos2d-x

Please update Neo area work.