cocos2d-js#1161: Fix MenuItemSprite's automatic init logic
cocos2d-js#1163: Made menu items' texture update in bake layer
Merge pull request #2481 from pandamicro/develop

cocos2d-js#1161: Fix MenuItemSprite's automatic init logic
Issue #2416: Refactor Cocostudio's renderer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2416_RefactorRenderer
Merge branch 'Iss2416_RefactorRenderer' of https://github.com/dingpinglv/cocos2d-html5 into Iss2416_RefactorRenderer

Conflicts:
	extensions/ccui/base-classes/CCProtectedNode.js