Merge branch 'develop' of github.com:anlide/cocos2d-html5 into legend

# Conflicts:
#	cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

Author: pandamicro

Diff for: cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -230,6 +230,10 @@ cc.Node.RenderCmd.prototype = {
                 }
             }
 
+            if (node._additionalTransformDirty) {
+                cc.affineTransformConcatIn(t, node._additionalTransform);
+            }
+
             if (pt) {
                 // cc.AffineTransformConcat is incorrect at get world transform
                 wt.a = t.a * pt.a + t.b * pt.c;                               //a
@@ -265,6 +269,10 @@ cc.Node.RenderCmd.prototype = {
                 }
             }
 
+            if (node._additionalTransformDirty) {
+                cc.affineTransformConcatIn(t, node._additionalTransform);
+            }
+
             if (pt) {
                 wt.a = t.a * pt.a + t.b * pt.c;
                 wt.b = t.a * pt.b + t.b * pt.d;
@@ -282,10 +290,6 @@ cc.Node.RenderCmd.prototype = {
             }
         }
 
-        if (node._additionalTransformDirty) {
-            cc.affineTransformConcatIn(t, node._additionalTransform);
-        }
-
         if (this._updateCurrentRegions) {
             this._updateCurrentRegions();
             this._notifyRegionStatus && this._notifyRegionStatus(cc.Node.CanvasRenderCmd.RegionStatus.DirtyDouble);