Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3

Former-commit-id: c497a8d

Author: slembcke

cocos2d/CCDirector.m

@@ -331,7 +331,7 @@ -(void) setView:(CCGLView*)view
 #ifdef __CC_PLATFORM_IOS
 		CGFloat scale = __view.layer.contentsScale ?: 1.0;
 #else
-		self.view.wantsBestResolutionOpenGLSurface = YES;
+		//self.view.wantsBestResolutionOpenGLSurface = YES;
 		CGFloat scale = self.view.window.backingScaleFactor;
 #endif