fix typo, should add not
merge cocostudio con with cocos2dx
merge basic.lua and basic_ccs.lua