Fixed #5042: Improve logic of CCLayer's setTouchEnabled
Merge branches 'v2.x' and 'v2.x' of https://github.com/cocos2d/cocos2d-html5 into v2.x
Merge pull request #1834 from pandamicro/v2.x

Fixed #5042: Improve logic of CCLayer's setTouchEnabled