Merge pull request #2481 from pandamicro/develop

cocos2d-js#1161: Fix MenuItemSprite's automatic init logic
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop