Merge branch 'v3.2' into develop

Conflicts:
	VERSION
	cocos2d/CCLabelTTF.m
	cocos2d/CCRenderer.m
	external/ObjectAL

Author: slembcke

VERSION

@@ -1 +1 @@
-3.3.0-alpha.1
+3.3.0-alpha.1

cocos2d-ui/CCBReader/CCBReader.m

@@ -1340,7 +1340,7 @@ - (CCNode*) readNodeGraphParent:(CCNode*)parent
         // Class was not found. Maybe it's a Swift class?
         // See http://stackoverflow.com/questions/24030814/swift-language-nsclassfromstring
         NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
-        NSString *classStringName = [NSString stringWithFormat:@"_TtC%d%@%d%@", appName.length, appName, className.length, className];
+        NSString *classStringName = [NSString stringWithFormat:@"_TtC%lu%@%lu%@", (unsigned long)appName.length, appName, (unsigned long)className.length, className];
         class = NSClassFromString(classStringName);
     }
     if (!class)

cocos2d/CCRenderTexture.m

@@ -469,7 +469,7 @@ - (void)clearDepth:(float)depthValue
 - (void)clearStencil:(int)stencilValue
 {
 	[self begin];
-		[_renderer enqueueClear:GL_DEPTH_BUFFER_BIT color:GLKVector4Make(0, 0, 0, 0) depth:0.0 stencil:stencilValue globalSortOrder:NSIntegerMin];
+		[_renderer enqueueClear:GL_STENCIL_BUFFER_BIT color:GLKVector4Make(0, 0, 0, 0) depth:0.0 stencil:stencilValue globalSortOrder:NSIntegerMin];
 	[self end];
 }
 

cocos2d/cocos2d.h

@@ -41,7 +41,7 @@
 
 // 0x00 HI ME LO
 // 00   03 01 01
-#define COCOS2D_VERSION 0x00030200
+#define COCOS2D_VERSION 0x00030201
 #define COCOS2D_BUILD @"release"
 //
 // all cocos2d include files