Merge branch 'v3.0' into v3.1

Conflicts:
	cocos2d/CCNode.m

Author: slembcke

cocos2d/CCNode.h

@@ -108,7 +108,7 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
 	NSMutableArray *_children;
 
 	// Weak ref to parent.
-	CCNode *__unsafe_unretained _parent;
+	__weak CCNode *_parent;
 
 	// A tag any name you want to assign to the node
     NSString* _name;
@@ -373,7 +373,7 @@ A common user pattern in building a Cocos2d game is to subclass CCNode, add it t
 -(void) removeAllChildrenWithCleanup:(BOOL)cleanup;
 
 /** A weak reference to the parent. */
-@property(nonatomic,readwrite,unsafe_unretained) CCNode* parent;
+@property(nonatomic,readwrite,weak) CCNode* parent;
 
 /** Array of child nodes. */
 @property(nonatomic,readonly) NSArray *children;

cocos2d/CCNode.m

@@ -221,12 +221,6 @@ - (NSString*) description
 - (void) dealloc
 {
 	CCLOGINFO( @"cocos2d: deallocing %@", self);
-
-	// children
-    for (CCNode* child in _children)
-		child.parent = nil;
-
-
 }
 
 #pragma mark Setters