Fixed: It's fixing Armature's setColor
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into setTransform
Fixed: corrected a bug of cc.Armature that it can't setColor
Merge pull request #2533 from dingpinglv/setTransform

Fixed: corrected a bug of cc.Armature that it can't setColor