Merge pull request #2387 from dingpinglv/develop

Fixed a bug of cc.LabelAtlas that its 'color' property doesn't work.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop