Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop

Author: jtwigg

VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

cocos2d/CCLabelTTF.m

@@ -667,6 +667,7 @@ - (CCTexture*) createTextureWithAttributedString:(NSAttributedString*)attributed
 
 	NSImage *image = [[NSImage alloc] initWithSize:POTSize];
 	[image lockFocus];
+    [[NSAffineTransform transform] set];
 
     // XXX: The shadows are for some reason scaled on OS X if a retina display is connected
     CGFloat retinaFix = 1;