1 修改Cocos-2dx,调整组件式结构
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x