Fix bug on component switch
Merge branch 'master' of https://github.com/synth-game/cocos2dx