updating to new core
Merge branch 'inEditor-v2' into cocos2dx-v2

* inEditor-v2:
  updating to new core