display team contents in the ifrontend
authorkoda
Fri, 02 Apr 2010 15:30:54 +0000
changeset 3253 b0b1b1310b7e
parent 3252 1550881c5bb8
child 3254 eb1382353361
display team contents in the ifrontend
cocoaTouch/iPad/DetailViewController.m
cocoaTouch/iPad/PopupMenuViewController.m
cocoaTouch/iPad/SingleTeamViewController.h
cocoaTouch/iPad/SingleTeamViewController.m
cocoaTouch/iPad/TeamSettingsViewController.m
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/cocoaTouch/iPad/DetailViewController.m	Fri Apr 02 15:28:09 2010 +0000
+++ b/cocoaTouch/iPad/DetailViewController.m	Fri Apr 02 15:30:54 2010 +0000
@@ -13,14 +13,13 @@
 @synthesize popoverController, detailItem, controllers;
 
 
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {
     self.title =@"First";
     NSMutableArray *array= [[NSMutableArray alloc] init];
 
     TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] 
                                                               initWithStyle:UITableViewStyleGrouped];
-    teamSettingsViewController.title =NSLocalizedString(@"Teams",@"");
+    teamSettingsViewController.title = NSLocalizedString(@"Teams",@"");
     [array addObject:teamSettingsViewController];
     [teamSettingsViewController release];
     
--- a/cocoaTouch/iPad/PopupMenuViewController.m	Fri Apr 02 15:28:09 2010 +0000
+++ b/cocoaTouch/iPad/PopupMenuViewController.m	Fri Apr 02 15:30:54 2010 +0000
@@ -96,17 +96,15 @@
 			NSLog(@"Warning: unset case value in section!");
 			break;
     }
-}
-
--(void) tableView:(UITableView *)aTableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath {
-    [aTableView deselectRowAtIndexPath: indexPath animated:YES];
+    
+    [aTableView deselectRowAtIndexPath:indexPath animated:YES];
 }
 
 #pragma mark -
 #pragma mark actionSheet methods
 -(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
 	if ([actionSheet cancelButtonIndex] != buttonIndex) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissPopover"  object:nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"dismissPopover" object:nil];
         HW_terminate(NO);
     }
 	else
@@ -114,5 +112,4 @@
             HW_pause();		
 }
 
-
 @end
--- a/cocoaTouch/iPad/SingleTeamViewController.h	Fri Apr 02 15:28:09 2010 +0000
+++ b/cocoaTouch/iPad/SingleTeamViewController.h	Fri Apr 02 15:30:54 2010 +0000
@@ -10,8 +10,10 @@
 
 
 @interface SingleTeamViewController : UITableViewController {
+    NSArray *hogsList;
     NSArray *secondaryItems;
 }
 
+@property (nonatomic,retain) NSArray *hogsList;
 @property (nonatomic,retain) NSArray *secondaryItems;
 @end
--- a/cocoaTouch/iPad/SingleTeamViewController.m	Fri Apr 02 15:28:09 2010 +0000
+++ b/cocoaTouch/iPad/SingleTeamViewController.m	Fri Apr 02 15:30:54 2010 +0000
@@ -10,7 +10,7 @@
 
 
 @implementation SingleTeamViewController
-@synthesize secondaryItems;
+@synthesize hogsList, secondaryItems;
 
 
 #pragma mark -
@@ -18,11 +18,18 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
 
+    
     // Uncomment the following line to preserve selection between presentations.
-    self.clearsSelectionOnViewWillAppear = NO;
+    //self.clearsSelectionOnViewWillAppear = NO;
  
     // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
     // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *teamFile = [[NSString alloc] initWithFormat:@"%@Teams/%@.plist",[paths objectAtIndex:0],self.title];
+    NSDictionary *teamDict = [[NSDictionary alloc] initWithContentsOfFile: teamFile];
+    [teamFile release];
+    self.hogsList = [teamDict objectForKey:@"hedgehogs"];
+    [teamDict release];
     
     NSMutableArray *array = [[NSMutableArray alloc] initWithObjects:
                              NSLocalizedString(@"Color",@""),
@@ -66,7 +73,6 @@
 
 #pragma mark -
 #pragma mark Table view data source
-
 -(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
     // Return the number of sections.
     return 3;
@@ -103,9 +109,16 @@
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
     }
     
+    NSInteger row = [indexPath row];
     switch ([indexPath section]) {
+        case 0:
+            cell.textLabel.text = self.title;
+            break;
+        case 1:
+            cell.textLabel.text = [[self.hogsList objectAtIndex:row] objectForKey:@"hogname"];
+            break;
         case 2:
-            cell.textLabel.text = [self.secondaryItems objectAtIndex:[indexPath row]];
+            cell.textLabel.text = [self.secondaryItems objectAtIndex:row];
             break;
         default:
             break;
@@ -181,13 +194,13 @@
 }
 
 -(void) viewDidUnload {
+    self.hogsList = nil;
     self.secondaryItems = nil;
-    // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
-    // For example: self.myOutlet = nil;
 }
 
 
 -(void) dealloc {
+    [hogsList release];
     [secondaryItems release];
     [super dealloc];
 }
--- a/cocoaTouch/iPad/TeamSettingsViewController.m	Fri Apr 02 15:28:09 2010 +0000
+++ b/cocoaTouch/iPad/TeamSettingsViewController.m	Fri Apr 02 15:30:54 2010 +0000
@@ -22,13 +22,10 @@
     
     NSArray *contents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:teamsDirectory
                                                                             error:NULL];
-    //NSArray *array = [[NSArray alloc] initWithObjects:@"Toy Story", @"A Bug's Life", @"Toy Story 2", 
-    //                  @"Monsters, Inc.",@"Finding Nemo", @"The Incredibles", @"Cars", @"Ratatouille", 
-    //                  @"WALL-E", @"Up", @"Toy Story 3", @"Cars 2", @"The Bear and the Bow", @"Newt", nil];
     self.list = contents;
    
     // Uncomment the following line to preserve selection between presentations.
-    self.clearsSelectionOnViewWillAppear = NO;
+    // self.clearsSelectionOnViewWillAppear = NO;
     // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
     // self.navigationItem.rightBarButtonItem = self.editButtonItem;
 }
@@ -124,11 +121,9 @@
     }
     
     NSInteger row = [indexPath row];
-    NSString *selectedMovie = [[list objectAtIndex:row] stringByDeletingPathExtension];
-    NSString *detailMessage = [[NSString alloc] initWithFormat:@"you pressed the button for %@", selectedMovie];
+    NSString *selectedTeam = [[list objectAtIndex:row] stringByDeletingPathExtension];
 
-    childController.title = selectedMovie;
-    [detailMessage release];
+    childController.title = selectedTeam;
     [self.navigationController pushViewController:childController animated:YES];
 
 }
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Fri Apr 02 15:28:09 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Fri Apr 02 15:30:54 2010 +0000
@@ -202,65 +202,25 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>615F165411663FA7002444F2</string>
+				<string>615F167111664BE1002444F2</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>DetailViewController.m</string>
+				<string>SingleTeamViewController.m</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>615F165511663FA7002444F2</string>
+						<string>615F167211664BE1002444F2</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>DetailViewController.m</string>
+						<string>SingleTeamViewController.m</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>615F165611663FA7002444F2</string>
+						<string>615F16B011664FD9002444F2</string>
 						<key>history</key>
 						<array>
-							<string>615F164F11663F90002444F2</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {927, 748}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>543 215 927 789 0 0 1920 1178 </string>
-			</dict>
-		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>615F15C6116629A0002444F2</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>TeamSettingsViewController.m</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>615F15C7116629A0002444F2</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>TeamSettingsViewController.m</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>615F165811663FA7002444F2</string>
-						<key>history</key>
-						<array>
-							<string>615F15C8116629A0002444F2</string>
-							<string>615F165711663FA7002444F2</string>
+							<string>615F167311664BE1002444F2</string>
+							<string>615F167411664BE1002444F2</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -276,14 +236,14 @@
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>665 268 895 637 0 0 1920 1178 </string>
+				<string>153 410 895 637 0 0 1920 1178 </string>
 			</dict>
 		</dict>
 		<dict>
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>615F162911663A99002444F2</string>
+				<string>615F168611664CBC002444F2</string>
 				<key>PBXProjectModuleLabel</key>
 				<string>MainMenuViewController.m</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
@@ -291,16 +251,16 @@
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>615F162A11663A99002444F2</string>
+						<string>615F168711664CBC002444F2</string>
 						<key>PBXProjectModuleLabel</key>
 						<string>MainMenuViewController.m</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>615F165911663FA7002444F2</string>
+						<string>615F16B111664FD9002444F2</string>
 						<key>history</key>
 						<array>
-							<string>615F161A116632E9002444F2</string>
+							<string>615F168111664CA7002444F2</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -323,24 +283,24 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>615F15C3116629A0002444F2</string>
+				<string>615F167611664BE1002444F2</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>GameSetup.m</string>
+				<string>TeamSettingsViewController.m</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>615F15C4116629A0002444F2</string>
+						<string>615F167711664BE1002444F2</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>GameSetup.m</string>
+						<string>TeamSettingsViewController.m</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>615F165A11663FA7002444F2</string>
+						<string>615F16B211664FD9002444F2</string>
 						<key>history</key>
 						<array>
-							<string>615F15AB1166270F002444F2</string>
+							<string>615F166D11664B1A002444F2</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -352,11 +312,11 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {1079, 773}}</string>
+				<string>{{0, 20}, {895, 596}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>760 312 1079 814 0 0 1920 1178 </string>
+				<string>665 268 895 637 0 0 1920 1178 </string>
 			</dict>
 		</dict>
 	</array>
@@ -391,8 +351,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -438,8 +396,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>10</integer>
-									<integer>6</integer>
+									<integer>17</integer>
 									<integer>5</integer>
 									<integer>2</integer>
 									<integer>0</integer>
@@ -481,7 +438,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>DetailViewController.m</string>
+								<string>MasterViewController.m</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -489,11 +446,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>DetailViewController.m</string>
+										<string>MasterViewController.m</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>615F165311663FA7002444F2</string>
+										<string>615F16AF11664FD9002444F2</string>
 										<key>history</key>
 										<array>
 											<string>6179889D114AA5BD00BA94A9</string>
@@ -537,7 +494,6 @@
 											<string>61CE2578115E78900098C467</string>
 											<string>61CE25B4115E7C940098C467</string>
 											<string>615E2397115F023B00B0ACA1</string>
-											<string>615E239B115F023B00B0ACA1</string>
 											<string>61CCBE60116135FF00833FE8</string>
 											<string>61CCBF1E116162CA00833FE8</string>
 											<string>61CCBF451161637F00833FE8</string>
@@ -580,12 +536,13 @@
 											<string>615F15B7116629A0002444F2</string>
 											<string>615F15B8116629A0002444F2</string>
 											<string>615F15B9116629A0002444F2</string>
-											<string>615F15BA116629A0002444F2</string>
 											<string>615F15BB116629A0002444F2</string>
 											<string>615F15DC11662BE8002444F2</string>
 											<string>615F162511663A99002444F2</string>
 											<string>615F165211663FA7002444F2</string>
-											<string>615F158311662071002444F2</string>
+											<string>615F166E11664BE1002444F2</string>
+											<string>615F166F11664BE1002444F2</string>
+											<string>615E239B115F023B00B0ACA1</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -607,6 +564,8 @@
 							<string>95pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -783,17 +742,16 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>615F165B11663FA7002444F2</string>
+		<string>615F16B311664FD9002444F2</string>
 		<string>615F15CF116629A0002444F2</string>
 		<string>615F159811662090002444F2</string>
-		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>61798848114AA42600BA94A9</string>
-		<string>615F15C3116629A0002444F2</string>
-		<string>615F162911663A99002444F2</string>
-		<string>615F15C6116629A0002444F2</string>
+		<string>615F167611664BE1002444F2</string>
 		<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
-		<string>615F165411663FA7002444F2</string>
+		<string>615F168611664CBC002444F2</string>
+		<string>1C78EAAD065D492600B07095</string>
+		<string>615F167111664BE1002444F2</string>
 	</array>
 	<key>WindowString</key>
 	<string>300 277 801 617 0 0 1920 1178 </string>
@@ -1177,7 +1135,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>Identifier</key>
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Fri Apr 02 15:28:09 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Fri Apr 02 15:30:54 2010 +0000
@@ -233,6 +233,50 @@
 			615F165811663FA7002444F2 /* PBXTextBookmark */ = 615F165811663FA7002444F2 /* PBXTextBookmark */;
 			615F165911663FA7002444F2 /* PBXTextBookmark */ = 615F165911663FA7002444F2 /* PBXTextBookmark */;
 			615F165A11663FA7002444F2 /* PBXTextBookmark */ = 615F165A11663FA7002444F2 /* PBXTextBookmark */;
+			615F165C1166404E002444F2 /* PBXTextBookmark */ = 615F165C1166404E002444F2 /* PBXTextBookmark */;
+			615F165D1166404E002444F2 /* PBXTextBookmark */ = 615F165D1166404E002444F2 /* PBXTextBookmark */;
+			615F165E1166404E002444F2 /* PBXTextBookmark */ = 615F165E1166404E002444F2 /* PBXTextBookmark */;
+			615F165F1166404E002444F2 /* PBXTextBookmark */ = 615F165F1166404E002444F2 /* PBXTextBookmark */;
+			615F16601166404E002444F2 /* PBXTextBookmark */ = 615F16601166404E002444F2 /* PBXTextBookmark */;
+			615F16631166410C002444F2 /* PBXTextBookmark */ = 615F16631166410C002444F2 /* PBXTextBookmark */;
+			615F16641166410C002444F2 /* PBXTextBookmark */ = 615F16641166410C002444F2 /* PBXTextBookmark */;
+			615F16651166410C002444F2 /* PBXTextBookmark */ = 615F16651166410C002444F2 /* PBXTextBookmark */;
+			615F166D11664B1A002444F2 /* PBXBookmark */ = 615F166D11664B1A002444F2 /* PBXBookmark */;
+			615F166E11664BE1002444F2 /* PBXTextBookmark */ = 615F166E11664BE1002444F2 /* PBXTextBookmark */;
+			615F166F11664BE1002444F2 /* PBXTextBookmark */ = 615F166F11664BE1002444F2 /* PBXTextBookmark */;
+			615F167011664BE1002444F2 /* PBXTextBookmark */ = 615F167011664BE1002444F2 /* PBXTextBookmark */;
+			615F167311664BE1002444F2 /* PBXTextBookmark */ = 615F167311664BE1002444F2 /* PBXTextBookmark */;
+			615F167411664BE1002444F2 /* PBXTextBookmark */ = 615F167411664BE1002444F2 /* PBXTextBookmark */;
+			615F167511664BE1002444F2 /* PBXTextBookmark */ = 615F167511664BE1002444F2 /* PBXTextBookmark */;
+			615F167811664BE1002444F2 /* PBXTextBookmark */ = 615F167811664BE1002444F2 /* PBXTextBookmark */;
+			615F167B11664C53002444F2 /* PBXTextBookmark */ = 615F167B11664C53002444F2 /* PBXTextBookmark */;
+			615F167C11664C53002444F2 /* PBXTextBookmark */ = 615F167C11664C53002444F2 /* PBXTextBookmark */;
+			615F167D11664C53002444F2 /* PBXTextBookmark */ = 615F167D11664C53002444F2 /* PBXTextBookmark */;
+			615F168111664CA7002444F2 /* PBXBookmark */ = 615F168111664CA7002444F2 /* PBXBookmark */;
+			615F168411664CBC002444F2 /* PBXTextBookmark */ = 615F168411664CBC002444F2 /* PBXTextBookmark */;
+			615F168511664CBC002444F2 /* PBXTextBookmark */ = 615F168511664CBC002444F2 /* PBXTextBookmark */;
+			615F168811664CBC002444F2 /* PBXTextBookmark */ = 615F168811664CBC002444F2 /* PBXTextBookmark */;
+			615F168911664CBC002444F2 /* PBXTextBookmark */ = 615F168911664CBC002444F2 /* PBXTextBookmark */;
+			615F168E11664D4D002444F2 /* PBXTextBookmark */ = 615F168E11664D4D002444F2 /* PBXTextBookmark */;
+			615F168F11664D4D002444F2 /* PBXTextBookmark */ = 615F168F11664D4D002444F2 /* PBXTextBookmark */;
+			615F169011664D4D002444F2 /* PBXTextBookmark */ = 615F169011664D4D002444F2 /* PBXTextBookmark */;
+			615F169111664D4D002444F2 /* PBXTextBookmark */ = 615F169111664D4D002444F2 /* PBXTextBookmark */;
+			615F169711664D77002444F2 /* PBXTextBookmark */ = 615F169711664D77002444F2 /* PBXTextBookmark */;
+			615F169811664D77002444F2 /* PBXTextBookmark */ = 615F169811664D77002444F2 /* PBXTextBookmark */;
+			615F169911664D77002444F2 /* PBXTextBookmark */ = 615F169911664D77002444F2 /* PBXTextBookmark */;
+			615F169A11664D77002444F2 /* PBXTextBookmark */ = 615F169A11664D77002444F2 /* PBXTextBookmark */;
+			615F169E11664E64002444F2 /* PBXTextBookmark */ = 615F169E11664E64002444F2 /* PBXTextBookmark */;
+			615F169F11664E64002444F2 /* PBXTextBookmark */ = 615F169F11664E64002444F2 /* PBXTextBookmark */;
+			615F16A011664E64002444F2 /* PBXTextBookmark */ = 615F16A011664E64002444F2 /* PBXTextBookmark */;
+			615F16A111664E64002444F2 /* PBXTextBookmark */ = 615F16A111664E64002444F2 /* PBXTextBookmark */;
+			615F16A611664EE8002444F2 /* PBXTextBookmark */ = 615F16A611664EE8002444F2 /* PBXTextBookmark */;
+			615F16A711664EE8002444F2 /* PBXTextBookmark */ = 615F16A711664EE8002444F2 /* PBXTextBookmark */;
+			615F16A811664EE8002444F2 /* PBXTextBookmark */ = 615F16A811664EE8002444F2 /* PBXTextBookmark */;
+			615F16A911664EE8002444F2 /* PBXTextBookmark */ = 615F16A911664EE8002444F2 /* PBXTextBookmark */;
+			615F16AF11664FD9002444F2 /* PBXTextBookmark */ = 615F16AF11664FD9002444F2 /* PBXTextBookmark */;
+			615F16B011664FD9002444F2 /* PBXTextBookmark */ = 615F16B011664FD9002444F2 /* PBXTextBookmark */;
+			615F16B111664FD9002444F2 /* PBXTextBookmark */ = 615F16B111664FD9002444F2 /* PBXTextBookmark */;
+			615F16B211664FD9002444F2 /* PBXTextBookmark */ = 615F16B211664FD9002444F2 /* PBXTextBookmark */;
 			61697B9E1163478A00CCDF37 = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
 			6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
 			61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */;
@@ -908,7 +952,7 @@
 		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
 		name = "DetailViewController.m: 76";
 		rLen = 0;
-		rLoc = 2343;
+		rLoc = 2250;
 		rType = 0;
 		vrLen = 1890;
 		vrLoc = 1075;
@@ -948,7 +992,7 @@
 		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
 		name = "DetailViewController.m: 74";
 		rLen = 0;
-		rLoc = 2274;
+		rLoc = 2181;
 		rType = 0;
 		vrLen = 1859;
 		vrLoc = 1075;
@@ -962,10 +1006,10 @@
 	};
 	615F159D1166216A002444F2 /* TeamSettingsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 2353}}";
-			sepNavSelRange = "{4418, 23}";
-			sepNavVisRange = "{4168, 1535}";
-			sepNavWindowFrame = "{{610, 162}, {895, 693}}";
+			sepNavIntBoundsRect = "{{0, 0}, {908, 2145}}";
+			sepNavSelRange = "{397, 189}";
+			sepNavVisRange = "{341, 1592}";
+			sepNavWindowFrame = "{{665, 212}, {895, 693}}";
 		};
 	};
 	615F15AB1166270F002444F2 /* PBXBookmark */ = {
@@ -975,16 +1019,16 @@
 	615F15AC116628CC002444F2 /* SingleTeamViewController.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {836, 565}}";
-			sepNavSelRange = "{330, 0}";
-			sepNavVisRange = "{0, 336}";
+			sepNavSelRange = "{338, 0}";
+			sepNavVisRange = "{0, 407}";
 		};
 	};
 	615F15AD116628CC002444F2 /* SingleTeamViewController.m */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            l = DetailViewController;\n            r = \"{4606, 24}\";\n            s = 1;\n        },\n                {\n            l = DetailViewController;\n            r = \"{4657, 24}\";\n            s = 1;\n        },\n                {\n            l = \"Nib name\";\n            r = \"{4707, 12}\";\n            s = 1;\n        }\n    );\n    r = \"{0, 5464}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {908, 2613}}";
-			sepNavSelRange = "{2835, 0}";
-			sepNavVisRange = "{2372, 159}";
+			sepNavFolds = "{\n    c =     (\n                {\n            l = DetailViewController;\n            r = \"{5267, 24}\";\n            s = 1;\n        },\n                {\n            l = DetailViewController;\n            r = \"{5318, 24}\";\n            s = 1;\n        },\n                {\n            l = \"Nib name\";\n            r = \"{5368, 12}\";\n            s = 1;\n        }\n    );\n    r = \"{0, 6042}\";\n    s = 0;\n}";
+			sepNavIntBoundsRect = "{{0, 0}, {1048, 2769}}";
+			sepNavSelRange = "{3523, 0}";
+			sepNavVisRange = "{2777, 1199}";
 			sepNavWindowFrame = "{{153, 354}, {895, 693}}";
 		};
 	};
@@ -1067,7 +1111,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 26";
 		rLen = 0;
-		rLoc = 1254;
+		rLoc = 939;
 		rType = 0;
 		vrLen = 309;
 		vrLoc = 744;
@@ -1097,7 +1141,7 @@
 		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
 		name = "DetailViewController.m: 21";
 		rLen = 0;
-		rLoc = 615;
+		rLoc = 521;
 		rType = 0;
 		vrLen = 2232;
 		vrLoc = 2115;
@@ -1107,7 +1151,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 80";
 		rLen = 0;
-		rLoc = 1957;
+		rLoc = 2382;
 		rType = 0;
 		vrLen = 1581;
 		vrLoc = 2112;
@@ -1187,7 +1231,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 109";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 174;
 		vrLoc = 2436;
@@ -1207,7 +1251,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 26";
 		rLen = 0;
-		rLoc = 1254;
+		rLoc = 939;
 		rType = 0;
 		vrLen = 309;
 		vrLoc = 744;
@@ -1217,7 +1261,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 26";
 		rLen = 0;
-		rLoc = 1254;
+		rLoc = 939;
 		rType = 0;
 		vrLen = 307;
 		vrLoc = 744;
@@ -1237,7 +1281,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 64";
 		rLen = 0;
-		rLoc = 2731;
+		rLoc = 2416;
 		rType = 0;
 		vrLen = 1514;
 		vrLoc = 1485;
@@ -1257,7 +1301,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 135";
 		rLen = 0;
-		rLoc = 5433;
+		rLoc = 4974;
 		rType = 0;
 		vrLen = 728;
 		vrLoc = 4484;
@@ -1267,7 +1311,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 135";
 		rLen = 0;
-		rLoc = 5433;
+		rLoc = 4974;
 		rType = 0;
 		vrLen = 836;
 		vrLoc = 4371;
@@ -1277,7 +1321,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 26";
 		rLen = 0;
-		rLoc = 1254;
+		rLoc = 939;
 		rType = 0;
 		vrLen = 307;
 		vrLoc = 744;
@@ -1287,7 +1331,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 139";
 		rLen = 0;
-		rLoc = 5433;
+		rLoc = 4974;
 		rType = 0;
 		vrLen = 1615;
 		vrLoc = 3731;
@@ -1307,7 +1351,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 26";
 		rLen = 0;
-		rLoc = 1254;
+		rLoc = 939;
 		rType = 0;
 		vrLen = 309;
 		vrLoc = 744;
@@ -1317,7 +1361,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 26";
 		rLen = 0;
-		rLoc = 1254;
+		rLoc = 939;
 		rType = 0;
 		vrLen = 307;
 		vrLoc = 744;
@@ -1327,7 +1371,7 @@
 		fRef = 615F15AC116628CC002444F2 /* SingleTeamViewController.h */;
 		name = "SingleTeamViewController.h: 16";
 		rLen = 0;
-		rLoc = 330;
+		rLoc = 347;
 		rType = 0;
 		vrLen = 336;
 		vrLoc = 0;
@@ -1337,7 +1381,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 31";
 		rLen = 0;
-		rLoc = 310;
+		rLoc = 320;
 		rType = 0;
 		vrLen = 988;
 		vrLoc = 194;
@@ -1347,7 +1391,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 121";
 		rLen = 0;
-		rLoc = 2973;
+		rLoc = 3634;
 		rType = 0;
 		vrLen = 1167;
 		vrLoc = 2342;
@@ -1357,7 +1401,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 139";
 		rLen = 0;
-		rLoc = 5433;
+		rLoc = 4974;
 		rType = 0;
 		vrLen = 1692;
 		vrLoc = 3731;
@@ -1367,7 +1411,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 124";
 		rLen = 0;
-		rLoc = 4698;
+		rLoc = 4269;
 		rType = 0;
 		vrLen = 1518;
 		vrLoc = 3731;
@@ -1391,7 +1435,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 30";
 		rLen = 0;
-		rLoc = 1254;
+		rLoc = 939;
 		rType = 0;
 		vrLen = 404;
 		vrLoc = 393;
@@ -1401,7 +1445,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 104";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 251;
 		vrLoc = 2360;
@@ -1411,7 +1455,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 105";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 159;
 		vrLoc = 2372;
@@ -1421,7 +1465,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 29";
 		rLen = 0;
-		rLoc = 1125;
+		rLoc = 807;
 		rType = 0;
 		vrLen = 1814;
 		vrLoc = 56;
@@ -1451,7 +1495,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 144";
 		rLen = 0;
-		rLoc = 5433;
+		rLoc = 4974;
 		rType = 0;
 		vrLen = 867;
 		vrLoc = 4534;
@@ -1461,7 +1505,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 105";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 159;
 		vrLoc = 2372;
@@ -1471,7 +1515,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 30";
 		rLen = 0;
-		rLoc = 1130;
+		rLoc = 812;
 		rType = 0;
 		vrLen = 1794;
 		vrLoc = 56;
@@ -1501,7 +1545,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 105";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 159;
 		vrLoc = 2372;
@@ -1511,7 +1555,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 68";
 		rLen = 0;
-		rLoc = 2622;
+		rLoc = 2307;
 		rType = 0;
 		vrLen = 1556;
 		vrLoc = 2033;
@@ -1541,7 +1585,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 105";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 159;
 		vrLoc = 2372;
@@ -1551,7 +1595,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 72";
 		rLen = 0;
-		rLoc = 2805;
+		rLoc = 2490;
 		rType = 0;
 		vrLen = 1558;
 		vrLoc = 2033;
@@ -1581,7 +1625,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 105";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 159;
 		vrLoc = 2372;
@@ -1591,7 +1635,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 127";
 		rLen = 0;
-		rLoc = 4578;
+		rLoc = 4262;
 		rType = 0;
 		vrLen = 1535;
 		vrLoc = 4168;
@@ -1625,7 +1669,7 @@
 		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 105";
 		rLen = 0;
-		rLoc = 2835;
+		rLoc = 3297;
 		rType = 0;
 		vrLen = 159;
 		vrLoc = 2372;
@@ -1645,7 +1689,7 @@
 		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
 		name = "DetailViewController.m: 21";
 		rLen = 0;
-		rLoc = 564;
+		rLoc = 470;
 		rType = 0;
 		vrLen = 1464;
 		vrLoc = 0;
@@ -1655,7 +1699,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 123";
 		rLen = 23;
-		rLoc = 4418;
+		rLoc = 4103;
 		rType = 0;
 		vrLen = 1535;
 		vrLoc = 4168;
@@ -1665,7 +1709,7 @@
 		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
 		name = "TeamSettingsViewController.m: 123";
 		rLen = 23;
-		rLoc = 4418;
+		rLoc = 4103;
 		rType = 0;
 		vrLen = 1535;
 		vrLoc = 4168;
@@ -1690,6 +1734,434 @@
 		vrLen = 3225;
 		vrLoc = 1444;
 	};
+	615F165C1166404E002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
+		name = "DetailViewController.m: 13";
+		rLen = 0;
+		rLoc = 267;
+		rType = 0;
+		vrLen = 135;
+		vrLoc = 190;
+	};
+	615F165D1166404E002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
+		name = "DetailViewController.m: 16";
+		rLen = 0;
+		rLoc = 325;
+		rType = 0;
+		vrLen = 1489;
+		vrLoc = 0;
+	};
+	615F165E1166404E002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 123";
+		rLen = 23;
+		rLoc = 4103;
+		rType = 0;
+		vrLen = 1559;
+		vrLoc = 4168;
+	};
+	615F165F1166404E002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 78";
+		rLen = 13;
+		rLoc = 2918;
+		rType = 0;
+		vrLen = 3017;
+		vrLoc = 1557;
+	};
+	615F16601166404E002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
+		name = "GameSetup.m: 88";
+		rLen = 0;
+		rLoc = 3450;
+		rType = 0;
+		vrLen = 3377;
+		vrLoc = 1444;
+	};
+	615F16631166410C002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
+		name = "DetailViewController.m: 13";
+		rLen = 0;
+		rLoc = 267;
+		rType = 0;
+		vrLen = 133;
+		vrLoc = 190;
+	};
+	615F16641166410C002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 28";
+		rLen = 0;
+		rLoc = 896;
+		rType = 0;
+		vrLen = 1682;
+		vrLoc = 341;
+	};
+	615F16651166410C002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
+		name = "GameSetup.m: 88";
+		rLen = 0;
+		rLoc = 3450;
+		rType = 0;
+		vrLen = 3225;
+		vrLoc = 1444;
+	};
+	615F166D11664B1A002444F2 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+	};
+	615F166E11664BE1002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */;
+		name = "DetailViewController.m: 13";
+		rLen = 0;
+		rLoc = 267;
+		rType = 0;
+		vrLen = 135;
+		vrLoc = 190;
+	};
+	615F166F11664BE1002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */;
+		name = "DetailViewController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 124;
+		vrLoc = 53;
+	};
+	615F167011664BE1002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 202;
+		vrLoc = 1685;
+	};
+	615F167311664BE1002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AC116628CC002444F2 /* SingleTeamViewController.h */;
+		name = "SingleTeamViewController.h: 17";
+		rLen = 0;
+		rLoc = 338;
+		rType = 0;
+		vrLen = 407;
+		vrLoc = 0;
+	};
+	615F167411664BE1002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 31";
+		rLen = 0;
+		rLoc = 1011;
+		rType = 0;
+		vrLen = 1513;
+		vrLoc = 0;
+	};
+	615F167511664BE1002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 13";
+		rLen = 0;
+		rLoc = 259;
+		rType = 0;
+		vrLen = 1523;
+		vrLoc = 0;
+	};
+	615F167811664BE1002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1705;
+		vrLoc = 341;
+	};
+	615F167B11664C53002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 155;
+		vrLoc = 1685;
+	};
+	615F167C11664C53002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 118";
+		rLen = 0;
+		rLoc = 3523;
+		rType = 0;
+		vrLen = 1252;
+		vrLoc = 2661;
+	};
+	615F167D11664C53002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1592;
+		vrLoc = 341;
+	};
+	615F168111664CA7002444F2 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+	};
+	615F168411664CBC002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 155;
+		vrLoc = 1685;
+	};
+	615F168511664CBC002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 33";
+		rLen = 0;
+		rLoc = 1073;
+		rType = 0;
+		vrLen = 1599;
+		vrLoc = 0;
+	};
+	615F168811664CBC002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 96";
+		rLen = 9;
+		rLoc = 3989;
+		rType = 0;
+		vrLen = 2854;
+		vrLoc = 1720;
+	};
+	615F168911664CBC002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1592;
+		vrLoc = 341;
+	};
+	615F168E11664D4D002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 155;
+		vrLoc = 1685;
+	};
+	615F168F11664D4D002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 32";
+		rLen = 0;
+		rLoc = 1068;
+		rType = 0;
+		vrLen = 1575;
+		vrLoc = 156;
+	};
+	615F169011664D4D002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 96";
+		rLen = 9;
+		rLoc = 3989;
+		rType = 0;
+		vrLen = 2854;
+		vrLoc = 1720;
+	};
+	615F169111664D4D002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1592;
+		vrLoc = 341;
+	};
+	615F169711664D77002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 155;
+		vrLoc = 1685;
+	};
+	615F169811664D77002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 118";
+		rLen = 0;
+		rLoc = 3442;
+		rType = 0;
+		vrLen = 1450;
+		vrLoc = 2845;
+	};
+	615F169911664D77002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 96";
+		rLen = 9;
+		rLoc = 3989;
+		rType = 0;
+		vrLen = 2854;
+		vrLoc = 1720;
+	};
+	615F169A11664D77002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1592;
+		vrLoc = 341;
+	};
+	615F169E11664E64002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 155;
+		vrLoc = 1685;
+	};
+	615F169F11664E64002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 34";
+		rLen = 0;
+		rLoc = 1097;
+		rType = 0;
+		vrLen = 1638;
+		vrLoc = 0;
+	};
+	615F16A011664E64002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 96";
+		rLen = 9;
+		rLoc = 3989;
+		rType = 0;
+		vrLen = 2854;
+		vrLoc = 1720;
+	};
+	615F16A111664E64002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1592;
+		vrLoc = 341;
+	};
+	615F16A611664EE8002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 155;
+		vrLoc = 1685;
+	};
+	615F16A711664EE8002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 34";
+		rLen = 0;
+		rLoc = 1097;
+		rType = 0;
+		vrLen = 1644;
+		vrLoc = 0;
+	};
+	615F16A811664EE8002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 96";
+		rLen = 9;
+		rLoc = 3989;
+		rType = 0;
+		vrLen = 2854;
+		vrLoc = 1720;
+	};
+	615F16A911664EE8002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1592;
+		vrLoc = 341;
+	};
+	615F16AF11664FD9002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA765B115DAACC00DA6ED0 /* MasterViewController.m */;
+		name = "MasterViewController.m: 43";
+		rLen = 0;
+		rLoc = 1543;
+		rType = 0;
+		vrLen = 155;
+		vrLoc = 1685;
+	};
+	615F16B011664FD9002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F15AD116628CC002444F2 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 118";
+		rLen = 0;
+		rLoc = 3523;
+		rType = 0;
+		vrLen = 1199;
+		vrLoc = 2777;
+	};
+	615F16B111664FD9002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */;
+		name = "MainMenuViewController.m: 96";
+		rLen = 9;
+		rLoc = 3989;
+		rType = 0;
+		vrLen = 2854;
+		vrLoc = 1720;
+	};
+	615F16B211664FD9002444F2 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 615F159D1166216A002444F2 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 20";
+		rLen = 189;
+		rLoc = 397;
+		rType = 0;
+		vrLen = 1592;
+		vrLoc = 341;
+	};
 	61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61798803114AA34C00BA94A9 /* uLandTexture.pas */;
@@ -2234,9 +2706,9 @@
 	};
 	61798888114AA4E600BA94A9 /* GameSetup.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1412, 4446}}";
-			sepNavSelRange = "{3450, 0}";
-			sepNavVisRange = "{1444, 3225}";
+			sepNavIntBoundsRect = "{{0, 0}, {1412, 4667}}";
+			sepNavSelRange = "{630, 0}";
+			sepNavVisRange = "{0, 1506}";
 			sepNavWindowFrame = "{{760, 256}, {1079, 870}}";
 		};
 	};
@@ -2553,17 +3025,17 @@
 	};
 	61CE24EC115E71C20098C467 /* PopupMenuViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {532, 260}}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 564}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 93}";
+			sepNavVisRange = "{0, 365}";
 			sepNavWindowFrame = "{{530, 457}, {897, 692}}";
 		};
 	};
 	61CE24ED115E71C20098C467 /* PopupMenuViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {532, 1612}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 159}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 1534}}";
+			sepNavSelRange = "{3509, 0}";
+			sepNavVisRange = "{1105, 1225}";
 			sepNavWindowFrame = "{{530, 457}, {897, 692}}";
 		};
 	};
@@ -2651,10 +3123,10 @@
 	};
 	61FA761E115DA0DB00DA6ED0 /* MainMenuViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 2405}}";
-			sepNavSelRange = "{2918, 13}";
-			sepNavVisRange = "{1557, 2922}";
-			sepNavWindowFrame = "{{815, 219}, {927, 845}}";
+			sepNavIntBoundsRect = "{{0, 0}, {868, 2353}}";
+			sepNavSelRange = "{3989, 9}";
+			sepNavVisRange = "{1720, 2854}";
+			sepNavWindowFrame = "{{681, 203}, {927, 845}}";
 		};
 	};
 	61FA7644115DA6A300DA6ED0 /* SplitViewRootController.h */ = {
@@ -2683,25 +3155,25 @@
 	};
 	61FA765B115DAACC00DA6ED0 /* MasterViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 1664}}";
-			sepNavSelRange = "{3057, 0}";
-			sepNavVisRange = "{2239, 2059}";
+			sepNavIntBoundsRect = "{{0, 0}, {1048, 1638}}";
+			sepNavSelRange = "{1543, 0}";
+			sepNavVisRange = "{1685, 155}";
 			sepNavWindowFrame = "{{92, 210}, {927, 845}}";
 		};
 	};
 	61FA7665115DAB1B00DA6ED0 /* DetailViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 717}}";
-			sepNavSelRange = "{365, 1}";
-			sepNavVisRange = "{0, 565}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 312}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{53, 124}";
 			sepNavWindowFrame = "{{364, 237}, {927, 845}}";
 		};
 	};
 	61FA7666115DAB1B00DA6ED0 /* DetailViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {868, 1885}}";
-			sepNavSelRange = "{564, 0}";
-			sepNavVisRange = "{0, 1464}";
+			sepNavIntBoundsRect = "{{0, 0}, {691, 1768}}";
+			sepNavSelRange = "{267, 0}";
+			sepNavVisRange = "{190, 135}";
 			sepNavWindowFrame = "{{543, 159}, {927, 845}}";
 		};
 	};