Merge pull request #1832 from pandamicro/v2.x

Fixed #5042: Improve logic of CCLayer's setTouchEnabled
Fixed #4975: rename sp.Skeleton.createWithFile to sp.Skeleton.create
Merge branch 'v2.x' of https://github.com/cocos2d/cocos2d-html5 into Iss4975_Spine
Merge pull request #1833 from dingpinglv/Iss4975_Spine

Fixed #4975: rename sp.Skeleton.createWithFile to sp.Skeleton.create
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