Fixed #5811: cc.Armature supports setting shader program
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into Iss5811_ArmatureShader
Merge pull request #2132 from dingpinglv/Iss5811_ArmatureShader

Fixed #5811: cc.Armature supports setting shader program