Issue #3501: update a reference of tuffy_bold_italic-charmap-hd.plist
Merge pull request #284 from dingpinglv/Iss3501_ReleasingV2.2.2

Issue #3501: update a reference of tuffy_bold_italic-charmap-hd.plist
issue #3419 move setTouchEnabled from onEnter to ctor
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Cocostudio