Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder

 into develop

Conflicts:
	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj

Documentation/7. Working with Animations.md

@@ -53,10 +53,10 @@ You can automatically play back a sequence of timelines by chaining them. You ca
 To have a timeline play in sequence, click the *No chained timeline* text and select the timeline you want to play right after the current one.
 
 ### Playing Back Animations in Code
-To programmatically control the animations you create with SpriteBuilder you will need to retrieve the *CCBAnimationManager*. The animation manager will be assigned to the nodes *userObject* when the ccbi-file is loaded.
+To programmatically control the animations you create with SpriteBuilder you will need to retrieve the *CCAnimationManager*. The animation manager is assigned to the node when the ccbi-file is loaded.
 
     CCNode* myNodeGraph = [CCBReader load:@"myFile.ccbi"];
-    CCBAnimationManager* animationManager = myNodeGraph.userObject;
+    CCAnimationManager* animationManager = myNodeGraph.userObject;
 
 The animation manager will be returned as an autoreleased object. To play back a specific timeline call the *runAnimationsForSequenceNamed:* method. If a timeline is currently playing, it will be immediately stopped when calling this method.
 

SpriteBuilder/Requirements.plist

@@ -4,7 +4,7 @@
 <dict>
 	<key>os</key>
 	<array>
-		<string>10.8</string>
+		<string>10.9</string>
 	</array>
 </dict>
 </plist>