usa a cached dictionary and write only when needed
authorkoda
Tue, 06 Apr 2010 21:54:46 +0000
changeset 3315 4e2813713358
parent 3314 bab4a078263f
child 3316 52f0482b043f
usa a cached dictionary and write only when needed
cocoaTouch/HogHatViewController.h
cocoaTouch/HogHatViewController.m
cocoaTouch/MainMenuViewController.m
cocoaTouch/SingleTeamViewController.h
cocoaTouch/SingleTeamViewController.m
cocoaTouch/TeamSettingsViewController.m
cocoaTouch/resources/Default-Landscape.png
cocoaTouch/resources/Default-iPad.png
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/cocoaTouch/HogHatViewController.h	Tue Apr 06 21:00:55 2010 +0000
+++ b/cocoaTouch/HogHatViewController.h	Tue Apr 06 21:54:46 2010 +0000
@@ -10,13 +10,18 @@
 
 
 @interface HogHatViewController : UITableViewController {
-    NSArray *hatList;
+    NSDictionary *teamDictionary;
+    NSInteger selectedHog;
+    
+    NSArray *hatArray;
     NSArray *hatSprites;
-    NSDictionary *hog;
+    NSIndexPath *lastIndexPath;
 }
 
-@property (nonatomic,retain) NSArray *hatList;
+@property (nonatomic,retain) NSDictionary * teamDictionary;
+@property (nonatomic) NSInteger selectedHog;
+@property (nonatomic,retain) NSArray *hatArray;
 @property (nonatomic,retain) NSArray *hatSprites;
-@property (nonatomic,retain) NSDictionary *hog;
+@property (nonatomic,retain) NSIndexPath *lastIndexPath;
 
 @end
--- a/cocoaTouch/HogHatViewController.m	Tue Apr 06 21:00:55 2010 +0000
+++ b/cocoaTouch/HogHatViewController.m	Tue Apr 06 21:54:46 2010 +0000
@@ -10,23 +10,22 @@
 
 
 @implementation HogHatViewController
-@synthesize hatList, hatSprites, hog;
+@synthesize teamDictionary, hatArray, hatSprites, lastIndexPath, selectedHog;
 
 #pragma mark -
 #pragma mark View lifecycle
-
-
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    //NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    // load all the hat file names and store them into hatArray
     NSString *hatPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"];
-    NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:hatPath
-                                                                         error:NULL];
-    self.hatList = array;
-    NSMutableArray *spriteArray = [[NSMutableArray alloc] initWithCapacity:[hatList count]];
-    for (int i=0; i< [hatList count]; i++) {
-        NSString *hatFile = [hatPath stringByAppendingString:[hatList objectAtIndex:i]];
+    NSArray *array = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:hatPath error:NULL];
+    self.hatArray = array;
+    
+    // load all the hat images from the previous array but save only the first sprite and store it in hatSprites
+    NSMutableArray *spriteArray = [[NSMutableArray alloc] initWithCapacity:[hatArray count]];
+    for (int i=0; i< [hatArray count]; i++) {
+        NSString *hatFile = [hatPath stringByAppendingString:[hatArray objectAtIndex:i]];
         
         UIImage *image = [[UIImage alloc] initWithContentsOfFile: hatFile];
         CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32);
@@ -40,12 +39,12 @@
     }
     self.hatSprites = spriteArray;
     [spriteArray release];
-    //NSLog(@"%@", hatList);
 }
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    self.title = [hog objectForKey:@"hogname"];
+    self.title = [[[teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:selectedHog] objectForKey:@"hogname"];
+
     // this updates the hog name and its hat
     [self.tableView reloadData];
     // this moves the tableview to the top
@@ -69,8 +68,7 @@
 */
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // Override to allow orientations other than the default portrait orientation.
-    return YES;
+    return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
 }
 
 
@@ -85,7 +83,7 @@
     if (0 == section) 
         rows = 1;
     else
-        rows = [self.hatList count];
+        rows = [self.hatArray count];
     return rows;
 }
 
@@ -99,14 +97,16 @@
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
     }
     
+    NSDictionary *hog = [[teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:selectedHog];
     if (0 == [indexPath section]) {
-        cell.textLabel.text = [hog objectForKey:@"hogname"];
+        cell.textLabel.text = self.title;
         cell.imageView.image = nil;
         cell.accessoryType = UITableViewCellAccessoryNone;
     } else {
-        cell.textLabel.text = [[hatList objectAtIndex:[indexPath row]] stringByDeletingPathExtension];
+        cell.textLabel.text = [[hatArray objectAtIndex:[indexPath row]] stringByDeletingPathExtension];
         if ([cell.textLabel.text isEqualToString:[hog objectForKey:@"hat"]]) {
             cell.accessoryType = UITableViewCellAccessoryCheckmark;
+            self.lastIndexPath = indexPath;
         } else {
             cell.accessoryType = UITableViewCellAccessoryNone;
         }
@@ -161,40 +161,53 @@
 #pragma mark -
 #pragma mark Table view delegate
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    // Navigation logic may go here. Create and push another view controller.
-	/*
-	 <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil];
-     // ...
-     // Pass the selected object to the new view controller.
-	 [self.navigationController pushViewController:detailViewController animated:YES];
-	 [detailViewController release];
-	 */
+- (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (1 == [indexPath section]) {
+        int newRow = [indexPath row];
+        int oldRow = (lastIndexPath != nil) ? [lastIndexPath row] : -1;
+        
+        if (newRow != oldRow) {
+            // if the two selected rows differ update data on the hog dictionary and reload table content
+            NSDictionary *oldHog = [[teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:selectedHog];
+
+            NSMutableDictionary *newHog = [[NSMutableDictionary alloc] initWithDictionary: oldHog];
+            [newHog setObject:[[hatArray objectAtIndex:newRow] stringByDeletingPathExtension] forKey:@"hat"];
+            [[teamDictionary objectForKey:@"hedgehogs"] replaceObjectAtIndex:selectedHog withObject:newHog];
+            [newHog release];
+            
+            // tell our boss to write this new stuff on disk
+            [[NSNotificationCenter defaultCenter] postNotificationName:@"setWriteNeedTeams" object:nil];
+            [self.tableView reloadData];
+
+            self.lastIndexPath = indexPath;
+            [self.tableView selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
+        } 
+        [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+    }
 }
 
 
 #pragma mark -
 #pragma mark Memory management
-
 - (void)didReceiveMemoryWarning {
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
-    
     // Relinquish ownership any cached data, images, etc that aren't in use.
 }
 
 - (void)viewDidUnload {
     [super viewDidUnload];
-    self.hatList = nil;
-    self.hog = nil;
-    // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
-    // For example: self.myOutlet = nil;
+    self.lastIndexPath = nil;
+    self.hatSprites = nil;
+    self.teamDictionary = nil;
+    self.hatArray = nil;
 }
 
-
 - (void)dealloc {
-    [hog release];
-    [hatList release];
+    [hatArray release];
+    [teamDictionary release];
+    [hatSprites release];
+    [lastIndexPath release];
     [super dealloc];
 }
 
--- a/cocoaTouch/MainMenuViewController.m	Tue Apr 06 21:00:55 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m	Tue Apr 06 21:54:46 2010 +0000
@@ -72,6 +72,7 @@
                                                        delegate:nil
                                               cancelButtonTitle:nil
                                               otherButtonTitles:nil];
+		[alert show];
 
 		UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] 
                                               initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
@@ -79,7 +80,6 @@
 		[indicator startAnimating];
 		[alert addSubview:indicator];
 		[indicator release];
-		[alert show];
 		[alert release];
 		
         // create Default Team.plist
--- a/cocoaTouch/SingleTeamViewController.h	Tue Apr 06 21:00:55 2010 +0000
+++ b/cocoaTouch/SingleTeamViewController.h	Tue Apr 06 21:54:46 2010 +0000
@@ -10,17 +10,15 @@
 
 @class HogHatViewController;
 @interface SingleTeamViewController : UITableViewController {
-    NSArray *hogsList;
-    NSArray *hatList;
+    NSMutableDictionary *teamDictionary;
+    NSArray *hatArray;
     NSArray *secondaryItems;
     
-    NSString *teamName;
-    
+    BOOL isWriteNeeded;
     HogHatViewController *hogChildController;
 }
 
-@property (nonatomic,retain) NSArray *hogsList;
-@property (nonatomic,retain) NSArray *hatList;
+@property (nonatomic,retain) NSMutableDictionary *teamDictionary;
+@property (nonatomic,retain) NSArray *hatArray;
 @property (nonatomic,retain) NSArray *secondaryItems;
-@property (nonatomic,retain) NSString *teamName;
 @end
--- a/cocoaTouch/SingleTeamViewController.m	Tue Apr 06 21:00:55 2010 +0000
+++ b/cocoaTouch/SingleTeamViewController.m	Tue Apr 06 21:54:46 2010 +0000
@@ -10,7 +10,7 @@
 #import "HogHatViewController.h"
 
 @implementation SingleTeamViewController
-@synthesize hogsList, hatList, secondaryItems, teamName;
+@synthesize teamDictionary, hatArray, secondaryItems;
 
 
 #pragma mark -
@@ -33,28 +33,30 @@
                              NSLocalizedString(@"Level",@""),nil];
     self.secondaryItems = array;
     [array release];
-}
-
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
     
     // load data about the team and extract info
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString *teamFile = [[NSString alloc] initWithFormat:@"%@/Teams/%@.plist",[paths objectAtIndex:0],self.teamName];
-    NSDictionary *teamDict = [[NSDictionary alloc] initWithContentsOfFile:teamFile];
+    NSString *teamFile = [[NSString alloc] initWithFormat:@"%@/Teams/%@.plist",[paths objectAtIndex:0],self.title];
+    NSMutableDictionary *teamDict = [[NSMutableDictionary alloc] initWithContentsOfFile:teamFile];
     [teamFile release];
-    
-    // grab the hog list
-    self.hogsList = [teamDict objectForKey:@"hedgehogs"];
+    self.teamDictionary = teamDict;
+    [teamDict release];
+
+    // listen if any childController modifies the plist and write it if needed
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setWriteNeeded) name:@"setWriteNeedTeams" object:nil];
+    isWriteNeeded = NO;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+
     // grab the name of the team
-    self.teamName = [teamDict objectForKey:@"teamname"];
-    self.title = self.teamName;
-    [teamDict release];
+    self.title = [self.teamDictionary objectForKey:@"teamname"];
     
     // load the images of the hat for aach hog
-    NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:[self.hogsList count]];
-    for (NSDictionary *hog in self.hogsList) {
+    NSArray *hogArray = [self.teamDictionary objectForKey:@"hedgehogs"];
+    NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:[hogArray count]];
+    for (NSDictionary *hog in hogArray) {
         NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/Data/Graphics/Hats/%@.png",[[NSBundle mainBundle] resourcePath],[hog objectForKey:@"hat"]];
 
         UIImage *image = [[UIImage alloc] initWithContentsOfFile: hatFile];
@@ -67,8 +69,10 @@
         CGImageRelease(cgImgage);
         [hatSprite release];
     }
-    self.hatList = array;
+    self.hatArray = array;
     [array release];
+    
+    [self.tableView reloadData];
 }
 
 /*
@@ -76,11 +80,25 @@
     [super viewDidAppear:animated];
 }
 */
-/*
-- (void)viewWillDisappear:(BOOL)animated {
+
+-(void) setWriteNeeded {
+    isWriteNeeded = YES;
+}
+
+// write to disk the team dictionary
+-(void) viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
+
+    if (isWriteNeeded) {
+        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+        NSString *teamFile = [[NSString alloc] initWithFormat:@"%@/Teams/%@.plist",[paths objectAtIndex:0],self.title];
+        [self.teamDictionary writeToFile: teamFile atomically:YES];
+        [teamFile release];
+
+        isWriteNeeded = NO;
+    }
 }
-*/
+
 /*
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
@@ -124,19 +142,22 @@
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault 
                                        reuseIdentifier:CellIdentifier] autorelease];
     }
-    
+    NSArray *hogArray;
     NSInteger row = [indexPath row];
     switch ([indexPath section]) {
         case 0:
-            cell.textLabel.text = teamName;
+            cell.textLabel.text = self.title;
+            cell.imageView.image = nil;
             break;
         case 1:
-            cell.textLabel.text = [[self.hogsList objectAtIndex:row] objectForKey:@"hogname"];
+            hogArray = [self.teamDictionary objectForKey:@"hedgehogs"];
+            cell.textLabel.text = [[hogArray objectAtIndex:row] objectForKey:@"hogname"];
             cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-            cell.imageView.image = [self.hatList objectAtIndex:row];
+            cell.imageView.image = [self.hatArray objectAtIndex:row];
             break;
         case 2:
             cell.textLabel.text = [self.secondaryItems objectAtIndex:row];
+            cell.imageView.image = nil;
             break;
         default:
             break;
@@ -188,15 +209,16 @@
 
 #pragma mark -
 #pragma mark Table view delegate
-
 -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     if (1 == [indexPath section]) {
         if (nil == hogChildController) {
             hogChildController = [[HogHatViewController alloc] initWithStyle:UITableViewStyleGrouped];
         }
-    
-        hogChildController.hog = [hogsList objectAtIndex:[indexPath row]];
-        //NSLog(@"%@",hogChildController.hog);
+        
+        // cache the dictionary file of the team, so that other controllers can modify it
+        hogChildController.teamDictionary = self.teamDictionary;
+        hogChildController.selectedHog = [indexPath row];
+
         [self.navigationController pushViewController:hogChildController animated:YES];
     }
 }
@@ -204,7 +226,6 @@
 
 #pragma mark -
 #pragma mark Memory management
-
 -(void) didReceiveMemoryWarning {
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
@@ -212,16 +233,17 @@
 }
 
 -(void) viewDidUnload {
-    self.hogsList = nil;
+    self.hatArray = nil;
     self.secondaryItems = nil;
-    self.teamName = nil;
+    self.teamDictionary = nil;
+    [super viewDidUnload];
 }
 
 
 -(void) dealloc {
     [secondaryItems release];
-    [hogsList release];
-    [teamName release];
+    [hatArray release];
+    [teamDictionary release];
     [super dealloc];
 }
 
--- a/cocoaTouch/TeamSettingsViewController.m	Tue Apr 06 21:00:55 2010 +0000
+++ b/cocoaTouch/TeamSettingsViewController.m	Tue Apr 06 21:54:46 2010 +0000
@@ -23,7 +23,7 @@
     NSArray *contents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:teamsDirectory
                                                                             error:NULL];
     self.list = contents;
-    NSLog(@"%@\n%@", teamsDirectory, contents);
+    //NSLog(@"%@\n%@", teamsDirectory, contents);
 
     // Uncomment the following line to preserve selection between presentations.
     // self.clearsSelectionOnViewWillAppear = NO;
@@ -32,26 +32,22 @@
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // Override to allow orientations other than the default portrait orientation.
     return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
 }
 
 
 #pragma mark -
 #pragma mark Table view data source
-
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     // Return the number of sections.
     return 1;
 }
 
-
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     // Return the number of rows in the section.
     return [list count];
 }
 
-
 // Customize the appearance of table view cells.
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     
@@ -66,8 +62,6 @@
     NSString *rowString = [[list objectAtIndex:row] stringByDeletingPathExtension]; 
     cell.textLabel.text = rowString; 
     cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-    //cell.imageView.image = [UIImage imageNamed:@"Default.png"];
-    //[rowString release];
     
     return cell;
 }
@@ -123,7 +117,7 @@
     NSInteger row = [indexPath row];
     NSString *selectedTeam = [[list objectAtIndex:row] stringByDeletingPathExtension];
     
-    childController.teamName = selectedTeam;
+    childController.title = selectedTeam;
     [self.navigationController pushViewController:childController animated:YES];
 }
 
@@ -149,12 +143,10 @@
     // Relinquish ownership any cached data, images, etc that aren't in use.
 }
 
-/*
 - (void)viewDidUnload {
-    // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
-    // For example: self.myOutlet = nil;
+    self.list = nil;
 }
-*/
+
 
 - (void)dealloc {
     [list release];
Binary file cocoaTouch/resources/Default-Landscape.png has changed
Binary file cocoaTouch/resources/Default-iPad.png has changed
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj	Tue Apr 06 21:00:55 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj	Tue Apr 06 21:54:46 2010 +0000
@@ -26,6 +26,7 @@
 		28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; };
 		28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; };
 		611B0AA1116B626E00112153 /* GeneralSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */; };
+		6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; };
 		61798816114AA34C00BA94A9 /* hwengine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */; };
 		61798818114AA34C00BA94A9 /* hwLibrary.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987E9114AA34C00BA94A9 /* hwLibrary.pas */; };
 		6179881B114AA34C00BA94A9 /* PascalExports.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987EC114AA34C00BA94A9 /* PascalExports.pas */; };
@@ -114,7 +115,6 @@
 		61A11AD61168DB3700359010 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AD51168DB3700359010 /* DetailViewController.m */; };
 		61A11AE11168DC6E00359010 /* SingleTeamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */; };
 		61A11AE41168DC9400359010 /* HogHatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */; };
-		61A11B591169234900359010 /* Default-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 61A11B581169234900359010 /* Default-iPad.png */; };
 		61CE250D115E749A0098C467 /* OverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; };
 		922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; };
 /* End PBXBuildFile section */
@@ -183,6 +183,7 @@
 		611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HedgewarsTitle.png; path = ../../QTfrontend/res/HedgewarsTitle.png; sourceTree = SOURCE_ROOT; };
 		611FD9CF1155A40700C2203D /* NetworkPlay.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = NetworkPlay.png; path = ../../QTfrontend/res/NetworkPlay.png; sourceTree = SOURCE_ROOT; };
 		611FD9D11155A41000C2203D /* Multiplayer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Multiplayer.png; path = ../../QTfrontend/res/Multiplayer.png; sourceTree = SOURCE_ROOT; };
+		6122CD00116BECCA002648E9 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "../../cocoaTouch/resources/Default-Landscape.png"; sourceTree = SOURCE_ROOT; };
 		617987E1114AA34C00BA94A9 /* CCHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = CCHandlers.inc; path = ../../hedgewars/CCHandlers.inc; sourceTree = SOURCE_ROOT; };
 		617987E4114AA34C00BA94A9 /* GSHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GSHandlers.inc; path = ../../hedgewars/GSHandlers.inc; sourceTree = SOURCE_ROOT; };
 		617987E5114AA34C00BA94A9 /* HHHandlers.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = HHHandlers.inc; path = ../../hedgewars/HHHandlers.inc; sourceTree = SOURCE_ROOT; };
@@ -287,7 +288,6 @@
 		61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SingleTeamViewController.m; path = ../../cocoaTouch/SingleTeamViewController.m; sourceTree = SOURCE_ROOT; };
 		61A11AE21168DC9400359010 /* HogHatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HogHatViewController.h; path = ../../cocoaTouch/HogHatViewController.h; sourceTree = SOURCE_ROOT; };
 		61A11AE31168DC9400359010 /* HogHatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HogHatViewController.m; path = ../../cocoaTouch/HogHatViewController.m; sourceTree = SOURCE_ROOT; };
-		61A11B581169234900359010 /* Default-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-iPad.png"; path = "../../cocoaTouch/resources/Default-iPad.png"; sourceTree = SOURCE_ROOT; };
 		61CE250B115E749A0098C467 /* OverlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OverlayViewController.h; path = ../../cocoaTouch/OverlayViewController.h; sourceTree = SOURCE_ROOT; };
 		61CE250C115E749A0098C467 /* OverlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OverlayViewController.m; path = ../../cocoaTouch/OverlayViewController.m; sourceTree = SOURCE_ROOT; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -411,8 +411,8 @@
 		6100DAD4115446B000F455E0 /* Resources-iPad */ = {
 			isa = PBXGroup;
 			children = (
+				6122CD00116BECCA002648E9 /* Default-Landscape.png */,
 				61CE2509115E74260098C467 /* XIB */,
-				61A11B581169234900359010 /* Default-iPad.png */,
 				611FD9C81155A1F200C2203D /* Background.png */,
 				611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */,
 				611FD9D11155A41000C2203D /* Multiplayer.png */,
@@ -770,7 +770,7 @@
 				61A118431168367200359010 /* OverlayViewController-iPhone.xib in Resources */,
 				61A118CA11683C7600359010 /* MainMenuViewController-iPad.xib in Resources */,
 				61A118CC11683C7A00359010 /* MainMenuViewController-iPhone.xib in Resources */,
-				61A11B591169234900359010 /* Default-iPad.png in Resources */,
+				6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Tue Apr 06 21:00:55 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Tue Apr 06 21:54:46 2010 +0000
@@ -197,48 +197,7 @@
 	<key>Notifications</key>
 	<array/>
 	<key>OpenEditors</key>
-	<array>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>611B0C49116BAF3A00112153</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>HogHatViewController.m</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>611B0C4A116BAF3A00112153</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>HogHatViewController.m</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>611B0C72116BB12800112153</string>
-						<key>history</key>
-						<array>
-							<string>611B0C3A116BAC7700112153</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}, {1058, 695}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>694 343 1058 736 0 0 1920 1178 </string>
-			</dict>
-		</dict>
-	</array>
+	<array/>
 	<key>PerspectiveWidths</key>
 	<array>
 		<integer>-1</integer>
@@ -270,8 +229,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -314,19 +271,17 @@
 								<string>61A11AD01168DB1F00359010</string>
 								<string>29B97317FDCFA39411CA2CEA</string>
 								<string>1C37FBAC04509CD000000102</string>
-								<string>611B0B0F116B734500112153</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>49</integer>
-									<integer>48</integer>
-									<integer>45</integer>
+									<integer>43</integer>
+									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 320}, {235, 558}}</string>
+							<string>{{0, 394}, {235, 558}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -361,7 +316,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>HogHatViewController.m</string>
+								<string>Default-Landscape.png</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -369,11 +324,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>HogHatViewController.m</string>
+										<string>Default-Landscape.png</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>611B0C71116BB12800112153</string>
+										<string>6122CD09116BED82002648E9</string>
 										<key>history</key>
 										<array>
 											<string>6179889D114AA5BD00BA94A9</string>
@@ -402,7 +357,6 @@
 											<string>61CE23FF115E4B290098C467</string>
 											<string>61CE2514115E74CC0098C467</string>
 											<string>61CE251F115E75A70098C467</string>
-											<string>61CE2577115E78900098C467</string>
 											<string>61CCBE60116135FF00833FE8</string>
 											<string>61CCBF1E116162CA00833FE8</string>
 											<string>61CCBF451161637F00833FE8</string>
@@ -438,8 +392,6 @@
 											<string>615F19911166A71E002444F2</string>
 											<string>61CEDAA1116ABECE0067BAFC</string>
 											<string>61CEDAA2116ABECE0067BAFC</string>
-											<string>61CEDAA3116ABECE0067BAFC</string>
-											<string>61CEDB37116AC9230067BAFC</string>
 											<string>61CEDB5F116ACBBB0067BAFC</string>
 											<string>61CEDB60116ACBBB0067BAFC</string>
 											<string>61CEDC94116ADCB80067BAFC</string>
@@ -449,7 +401,10 @@
 											<string>611B0B84116B817C00112153</string>
 											<string>611B0BE9116BA1CC00112153</string>
 											<string>611B0C42116BAF3A00112153</string>
-											<string>61CEDAB7116AC0330067BAFC</string>
+											<string>61DFFE27116BC80100EA93BB</string>
+											<string>6122CC91116BE651002648E9</string>
+											<string>6122CD06116BECE0002648E9</string>
+											<string>6122CD07116BECE0002648E9</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -461,16 +416,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {544, 35}}</string>
+								<string>{{0, 0}, {544, 171}}</string>
 								<key>RubberWindowFrame</key>
 								<string>162 341 801 617 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>35pt</string>
+							<string>171pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -481,14 +438,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 40}, {544, 536}}</string>
+								<string>{{0, 176}, {544, 400}}</string>
 								<key>RubberWindowFrame</key>
 								<string>162 341 801 617 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>536pt</string>
+							<string>400pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -507,9 +464,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>611B0A98116B622000112153</string>
+				<string>6122CB05116BC967002648E9</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>611B0A99116B622000112153</string>
+				<string>6122CB06116BC967002648E9</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -647,14 +604,12 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>611B0C73116BB12800112153</string>
-		<string>611B0AD3116B6E8B00112153</string>
-		<string>611B0AD4116B6E8B00112153</string>
+		<string>6122CB1F116BC991002648E9</string>
+		<string>6122CB12116BC967002648E9</string>
+		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>61798848114AA42600BA94A9</string>
-		<string>1C78EAAD065D492600B07095</string>
 		<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
-		<string>611B0C49116BAF3A00112153</string>
 	</array>
 	<key>WindowString</key>
 	<string>162 341 801 617 0 0 1920 1178 </string>
@@ -673,12 +628,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>SingleTeamViewController.m</string>
+								<string>HogHatViewController.m</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -695,8 +652,6 @@
 							<string>307pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -736,7 +691,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>61798848114AA42600BA94A9</string>
-				<string>611B0A9B116B622000112153</string>
+				<string>6122CB09116BC967002648E9</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -860,13 +815,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>611B0ABB116B66BE00112153</string>
+				<string>6122CB0A116BC967002648E9</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>611B0ABC116B66BE00112153</string>
-				<string>611B0ABD116B66BE00112153</string>
-				<string>611B0ABE116B66BE00112153</string>
-				<string>611B0ABF116B66BE00112153</string>
-				<string>611B0AC0116B66BE00112153</string>
+				<string>6122CB0B116BC967002648E9</string>
+				<string>6122CB0C116BC967002648E9</string>
+				<string>6122CB0D116BC967002648E9</string>
+				<string>6122CB0E116BC967002648E9</string>
+				<string>6122CB0F116BC967002648E9</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -1030,7 +985,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>611B0AC1116B66BE00112153</string>
+				<string>6122CB10116BC967002648E9</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
@@ -1040,7 +995,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>Identifier</key>
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Tue Apr 06 21:00:55 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Tue Apr 06 21:54:46 2010 +0000
@@ -9,7 +9,7 @@
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
 		activeBuildConfigurationName = Debug;
 		activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */;
-		activeSDKPreference = iphonesimulator3.0;
+		activeSDKPreference = iphonesimulator3.2;
 		activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */;
 		addToTargets = (
 			1D6058900D05DD3D006BFB54 /* HedgewarsMobile */,
@@ -49,6 +49,20 @@
 					PBXBreakpointsDataSource_ContinueID,
 				);
 			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					22,
+					300,
+					192.58349609375,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXExecutablesDataSource_ActiveFlagID,
+					PBXExecutablesDataSource_NameID,
+					PBXExecutablesDataSource_CommentsID,
+				);
+			};
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
 				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
@@ -93,310 +107,85 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 292250055;
-			PBXWorkspaceStateSaveDate = 292250055;
+			PBXPerProjectTemplateStateSaveDate = 292276574;
+			PBXWorkspaceStateSaveDate = 292276574;
 		};
 		perUserProjectItems = {
-			611B0A95116B622000112153 /* PBXTextBookmark */ = 611B0A95116B622000112153 /* PBXTextBookmark */;
-			611B0A96116B622000112153 /* PBXTextBookmark */ = 611B0A96116B622000112153 /* PBXTextBookmark */;
-			611B0A97116B622000112153 /* PBXTextBookmark */ = 611B0A97116B622000112153 /* PBXTextBookmark */;
-			611B0A9A116B622000112153 /* PBXTextBookmark */ = 611B0A9A116B622000112153 /* PBXTextBookmark */;
-			611B0AA8116B635B00112153 /* XCBuildMessageTextBookmark */ = 611B0AA8116B635B00112153 /* XCBuildMessageTextBookmark */;
-			611B0AA9116B635B00112153 /* PBXTextBookmark */ = 611B0AA9116B635B00112153 /* PBXTextBookmark */;
-			611B0AB8116B66BE00112153 /* PBXTextBookmark */ = 611B0AB8116B66BE00112153 /* PBXTextBookmark */;
-			611B0AB9116B66BE00112153 /* XCBuildMessageTextBookmark */ = 611B0AB9116B66BE00112153 /* XCBuildMessageTextBookmark */;
-			611B0ABA116B66BE00112153 /* PBXTextBookmark */ = 611B0ABA116B66BE00112153 /* PBXTextBookmark */;
 			611B0AC6116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
 			611B0AC7116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC7116B6E8B00112153 /* PBXTextBookmark */;
 			611B0AC8116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC8116B6E8B00112153 /* PBXTextBookmark */;
-			611B0AC9116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC9116B6E8B00112153 /* PBXTextBookmark */;
-			611B0ACA116B6E8B00112153 /* XCBuildMessageTextBookmark */ = 611B0ACA116B6E8B00112153 /* XCBuildMessageTextBookmark */;
-			611B0ACB116B6E8B00112153 /* PBXTextBookmark */ = 611B0ACB116B6E8B00112153 /* PBXTextBookmark */;
-			611B0ACE116B6E8B00112153 /* PBXTextBookmark */ = 611B0ACE116B6E8B00112153 /* PBXTextBookmark */;
-			611B0ACF116B6E8B00112153 /* PBXTextBookmark */ = 611B0ACF116B6E8B00112153 /* PBXTextBookmark */;
-			611B0AD0116B6E8B00112153 /* PBXTextBookmark */ = 611B0AD0116B6E8B00112153 /* PBXTextBookmark */;
-			611B0AD1116B6E8B00112153 /* PBXTextBookmark */ = 611B0AD1116B6E8B00112153 /* PBXTextBookmark */;
-			611B0AD9116B6EEA00112153 /* PBXTextBookmark */ = 611B0AD9116B6EEA00112153 /* PBXTextBookmark */;
-			611B0ADA116B6EEA00112153 /* PBXTextBookmark */ = 611B0ADA116B6EEA00112153 /* PBXTextBookmark */;
-			611B0ADB116B6EEA00112153 /* PBXTextBookmark */ = 611B0ADB116B6EEA00112153 /* PBXTextBookmark */;
-			611B0ADF116B6FB200112153 /* PBXTextBookmark */ = 611B0ADF116B6FB200112153 /* PBXTextBookmark */;
-			611B0AE0116B6FB300112153 /* PBXTextBookmark */ = 611B0AE0116B6FB300112153 /* PBXTextBookmark */;
-			611B0AE1116B6FB300112153 /* PBXTextBookmark */ = 611B0AE1116B6FB300112153 /* PBXTextBookmark */;
-			611B0AE2116B6FB300112153 /* PBXTextBookmark */ = 611B0AE2116B6FB300112153 /* PBXTextBookmark */;
-			611B0AE3116B6FB300112153 /* PBXTextBookmark */ = 611B0AE3116B6FB300112153 /* PBXTextBookmark */;
-			611B0AE4116B6FB300112153 /* PBXTextBookmark */ = 611B0AE4116B6FB300112153 /* PBXTextBookmark */;
-			611B0AE5116B70A300112153 /* PBXBookmark */ = 611B0AE5116B70A300112153 /* PBXBookmark */;
-			611B0AE6116B70D700112153 /* PBXBookmark */ = 611B0AE6116B70D700112153 /* PBXBookmark */;
-			611B0AE9116B70F300112153 /* PBXTextBookmark */ = 611B0AE9116B70F300112153 /* PBXTextBookmark */;
-			611B0AEC116B70F300112153 /* PBXTextBookmark */ = 611B0AEC116B70F300112153 /* PBXTextBookmark */;
-			611B0AEF116B70F300112153 /* PBXTextBookmark */ = 611B0AEF116B70F300112153 /* PBXTextBookmark */;
-			611B0AF0116B70F300112153 /* PBXTextBookmark */ = 611B0AF0116B70F300112153 /* PBXTextBookmark */;
-			611B0AF1116B70F300112153 /* PBXTextBookmark */ = 611B0AF1116B70F300112153 /* PBXTextBookmark */;
-			611B0AF2116B70F300112153 /* PBXTextBookmark */ = 611B0AF2116B70F300112153 /* PBXTextBookmark */;
-			611B0AF4116B710800112153 /* PBXTextBookmark */ = 611B0AF4116B710800112153 /* PBXTextBookmark */;
-			611B0AF5116B710E00112153 /* PBXTextBookmark */ = 611B0AF5116B710E00112153 /* PBXTextBookmark */;
-			611B0AF6116B710F00112153 /* PBXTextBookmark */ = 611B0AF6116B710F00112153 /* PBXTextBookmark */;
-			611B0AF7116B710F00112153 /* PBXTextBookmark */ = 611B0AF7116B710F00112153 /* PBXTextBookmark */;
-			611B0AF8116B710F00112153 /* PBXTextBookmark */ = 611B0AF8116B710F00112153 /* PBXTextBookmark */;
-			611B0AF9116B710F00112153 /* PBXTextBookmark */ = 611B0AF9116B710F00112153 /* PBXTextBookmark */;
-			611B0AFA116B717C00112153 /* PBXBookmark */ = 611B0AFA116B717C00112153 /* PBXBookmark */;
-			611B0AFD116B71E600112153 /* PBXTextBookmark */ = 611B0AFD116B71E600112153 /* PBXTextBookmark */;
-			611B0AFE116B71E600112153 /* PBXTextBookmark */ = 611B0AFE116B71E600112153 /* PBXTextBookmark */;
-			611B0AFF116B71E600112153 /* PBXTextBookmark */ = 611B0AFF116B71E600112153 /* PBXTextBookmark */;
-			611B0B00116B71E600112153 /* PBXTextBookmark */ = 611B0B00116B71E600112153 /* PBXTextBookmark */;
-			611B0B03116B71E600112153 /* PBXTextBookmark */ = 611B0B03116B71E600112153 /* PBXTextBookmark */;
-			611B0B07116B724D00112153 /* PBXTextBookmark */ = 611B0B07116B724D00112153 /* PBXTextBookmark */;
-			611B0B08116B724D00112153 /* PBXTextBookmark */ = 611B0B08116B724D00112153 /* PBXTextBookmark */;
-			611B0B09116B724D00112153 /* PBXTextBookmark */ = 611B0B09116B724D00112153 /* PBXTextBookmark */;
-			611B0B10116B734500112153 /* PBXTextBookmark */ = 611B0B10116B734500112153 /* PBXTextBookmark */;
-			611B0B11116B734500112153 /* PBXTextBookmark */ = 611B0B11116B734500112153 /* PBXTextBookmark */;
-			611B0B12116B734500112153 /* PBXTextBookmark */ = 611B0B12116B734500112153 /* PBXTextBookmark */;
-			611B0B16116B759A00112153 /* PBXTextBookmark */ = 611B0B16116B759A00112153 /* PBXTextBookmark */;
-			611B0B17116B759A00112153 /* PBXTextBookmark */ = 611B0B17116B759A00112153 /* PBXTextBookmark */;
-			611B0B18116B759A00112153 /* PBXTextBookmark */ = 611B0B18116B759A00112153 /* PBXTextBookmark */;
-			611B0B1E116B7A6000112153 /* PBXTextBookmark */ = 611B0B1E116B7A6000112153 /* PBXTextBookmark */;
-			611B0B1F116B7A6000112153 /* PBXTextBookmark */ = 611B0B1F116B7A6000112153 /* PBXTextBookmark */;
-			611B0B20116B7A6000112153 /* PBXTextBookmark */ = 611B0B20116B7A6000112153 /* PBXTextBookmark */;
-			611B0B21116B7A6000112153 /* PBXTextBookmark */ = 611B0B21116B7A6000112153 /* PBXTextBookmark */;
-			611B0B22116B7A6000112153 /* PBXTextBookmark */ = 611B0B22116B7A6000112153 /* PBXTextBookmark */;
-			611B0B26116B7AD400112153 /* PBXTextBookmark */ = 611B0B26116B7AD400112153 /* PBXTextBookmark */;
-			611B0B27116B7AD400112153 /* PBXTextBookmark */ = 611B0B27116B7AD400112153 /* PBXTextBookmark */;
-			611B0B28116B7AD400112153 /* PBXTextBookmark */ = 611B0B28116B7AD400112153 /* PBXTextBookmark */;
-			611B0B29116B7AD400112153 /* PBXTextBookmark */ = 611B0B29116B7AD400112153 /* PBXTextBookmark */;
-			611B0B2A116B7AD400112153 /* PBXTextBookmark */ = 611B0B2A116B7AD400112153 /* PBXTextBookmark */;
-			611B0B2E116B7B0600112153 /* PBXTextBookmark */ = 611B0B2E116B7B0600112153 /* PBXTextBookmark */;
-			611B0B2F116B7B0600112153 /* PBXTextBookmark */ = 611B0B2F116B7B0600112153 /* PBXTextBookmark */;
-			611B0B30116B7B0600112153 /* PBXTextBookmark */ = 611B0B30116B7B0600112153 /* PBXTextBookmark */;
-			611B0B34116B7B1F00112153 /* PBXTextBookmark */ = 611B0B34116B7B1F00112153 /* PBXTextBookmark */;
-			611B0B35116B7B1F00112153 /* PBXTextBookmark */ = 611B0B35116B7B1F00112153 /* PBXTextBookmark */;
-			611B0B36116B7B1F00112153 /* PBXTextBookmark */ = 611B0B36116B7B1F00112153 /* PBXTextBookmark */;
-			611B0B3A116B7B3200112153 /* PBXTextBookmark */ = 611B0B3A116B7B3200112153 /* PBXTextBookmark */;
-			611B0B3B116B7B3200112153 /* PBXTextBookmark */ = 611B0B3B116B7B3200112153 /* PBXTextBookmark */;
-			611B0B3C116B7B3200112153 /* PBXTextBookmark */ = 611B0B3C116B7B3200112153 /* PBXTextBookmark */;
-			611B0B42116B7C8D00112153 /* PBXTextBookmark */ = 611B0B42116B7C8D00112153 /* PBXTextBookmark */;
-			611B0B43116B7C8D00112153 /* PBXTextBookmark */ = 611B0B43116B7C8D00112153 /* PBXTextBookmark */;
-			611B0B44116B7C8D00112153 /* PBXTextBookmark */ = 611B0B44116B7C8D00112153 /* PBXTextBookmark */;
-			611B0B48116B7CA100112153 /* PBXTextBookmark */ = 611B0B48116B7CA100112153 /* PBXTextBookmark */;
-			611B0B49116B7CA100112153 /* PBXTextBookmark */ = 611B0B49116B7CA100112153 /* PBXTextBookmark */;
-			611B0B4A116B7CA100112153 /* PBXTextBookmark */ = 611B0B4A116B7CA100112153 /* PBXTextBookmark */;
-			611B0B4B116B7CA100112153 /* PBXTextBookmark */ = 611B0B4B116B7CA100112153 /* PBXTextBookmark */;
-			611B0B51116B7CEC00112153 /* PBXTextBookmark */ = 611B0B51116B7CEC00112153 /* PBXTextBookmark */;
-			611B0B52116B7CEC00112153 /* PBXTextBookmark */ = 611B0B52116B7CEC00112153 /* PBXTextBookmark */;
-			611B0B53116B7CEC00112153 /* PBXTextBookmark */ = 611B0B53116B7CEC00112153 /* PBXTextBookmark */;
-			611B0B54116B7CEC00112153 /* PBXTextBookmark */ = 611B0B54116B7CEC00112153 /* PBXTextBookmark */;
-			611B0B5F116B7E2400112153 /* PBXTextBookmark */ = 611B0B5F116B7E2400112153 /* PBXTextBookmark */;
-			611B0B60116B7E2400112153 /* PBXTextBookmark */ = 611B0B60116B7E2400112153 /* PBXTextBookmark */;
-			611B0B61116B7E2400112153 /* PBXTextBookmark */ = 611B0B61116B7E2400112153 /* PBXTextBookmark */;
-			611B0B65116B7E7900112153 /* PBXTextBookmark */ = 611B0B65116B7E7900112153 /* PBXTextBookmark */;
-			611B0B66116B7E7900112153 /* PBXTextBookmark */ = 611B0B66116B7E7900112153 /* PBXTextBookmark */;
-			611B0B67116B7E7900112153 /* PBXTextBookmark */ = 611B0B67116B7E7900112153 /* PBXTextBookmark */;
-			611B0B6B116B7EAC00112153 /* PBXTextBookmark */ = 611B0B6B116B7EAC00112153 /* PBXTextBookmark */;
-			611B0B6C116B7EAC00112153 /* PBXTextBookmark */ = 611B0B6C116B7EAC00112153 /* PBXTextBookmark */;
-			611B0B6D116B7EAC00112153 /* PBXTextBookmark */ = 611B0B6D116B7EAC00112153 /* PBXTextBookmark */;
-			611B0B71116B7EE000112153 /* PBXTextBookmark */ = 611B0B71116B7EE000112153 /* PBXTextBookmark */;
-			611B0B72116B7EE000112153 /* PBXTextBookmark */ = 611B0B72116B7EE000112153 /* PBXTextBookmark */;
-			611B0B73116B7EE000112153 /* PBXTextBookmark */ = 611B0B73116B7EE000112153 /* PBXTextBookmark */;
-			611B0B77116B7F7300112153 /* PBXTextBookmark */ = 611B0B77116B7F7300112153 /* PBXTextBookmark */;
-			611B0B78116B7F7300112153 /* PBXTextBookmark */ = 611B0B78116B7F7300112153 /* PBXTextBookmark */;
-			611B0B79116B7F7300112153 /* PBXTextBookmark */ = 611B0B79116B7F7300112153 /* PBXTextBookmark */;
 			611B0B84116B817C00112153 /* PBXTextBookmark */ = 611B0B84116B817C00112153 /* PBXTextBookmark */;
-			611B0B85116B817C00112153 /* PBXTextBookmark */ = 611B0B85116B817C00112153 /* PBXTextBookmark */;
-			611B0B86116B817C00112153 /* PBXTextBookmark */ = 611B0B86116B817C00112153 /* PBXTextBookmark */;
-			611B0B87116B817C00112153 /* PBXTextBookmark */ = 611B0B87116B817C00112153 /* PBXTextBookmark */;
-			611B0B89116B8EC300112153 /* PBXTextBookmark */ = 611B0B89116B8EC300112153 /* PBXTextBookmark */;
-			611B0B8A116B8EC300112153 /* PBXTextBookmark */ = 611B0B8A116B8EC300112153 /* PBXTextBookmark */;
-			611B0B8B116B8EC300112153 /* PBXTextBookmark */ = 611B0B8B116B8EC300112153 /* PBXTextBookmark */;
-			611B0B96116B908C00112153 /* PBXTextBookmark */ = 611B0B96116B908C00112153 /* PBXTextBookmark */;
-			611B0B97116B908C00112153 /* PBXTextBookmark */ = 611B0B97116B908C00112153 /* PBXTextBookmark */;
-			611B0B98116B908C00112153 /* PBXTextBookmark */ = 611B0B98116B908C00112153 /* PBXTextBookmark */;
-			611B0B9D116B90A700112153 /* PBXTextBookmark */ = 611B0B9D116B90A700112153 /* PBXTextBookmark */;
-			611B0B9E116B90A700112153 /* PBXTextBookmark */ = 611B0B9E116B90A700112153 /* PBXTextBookmark */;
-			611B0B9F116B90A700112153 /* PBXTextBookmark */ = 611B0B9F116B90A700112153 /* PBXTextBookmark */;
-			611B0BA4116B91BB00112153 /* PBXTextBookmark */ = 611B0BA4116B91BB00112153 /* PBXTextBookmark */;
-			611B0BA5116B91BB00112153 /* PBXTextBookmark */ = 611B0BA5116B91BB00112153 /* PBXTextBookmark */;
-			611B0BA6116B91BB00112153 /* PBXTextBookmark */ = 611B0BA6116B91BB00112153 /* PBXTextBookmark */;
-			611B0BA7116B91BB00112153 /* PBXTextBookmark */ = 611B0BA7116B91BB00112153 /* PBXTextBookmark */;
-			611B0BA9116B936A00112153 /* PBXTextBookmark */ = 611B0BA9116B936A00112153 /* PBXTextBookmark */;
-			611B0BAA116B936A00112153 /* PBXTextBookmark */ = 611B0BAA116B936A00112153 /* PBXTextBookmark */;
-			611B0BAB116B936A00112153 /* PBXTextBookmark */ = 611B0BAB116B936A00112153 /* PBXTextBookmark */;
-			611B0BAC116B936A00112153 /* PBXTextBookmark */ = 611B0BAC116B936A00112153 /* PBXTextBookmark */;
-			611B0BAD116B936A00112153 /* PBXTextBookmark */ = 611B0BAD116B936A00112153 /* PBXTextBookmark */;
-			611B0BAE116B936A00112153 /* PBXTextBookmark */ = 611B0BAE116B936A00112153 /* PBXTextBookmark */;
-			611B0BAF116B936A00112153 /* PBXTextBookmark */ = 611B0BAF116B936A00112153 /* PBXTextBookmark */;
-			611B0BB0116B936A00112153 /* PBXTextBookmark */ = 611B0BB0116B936A00112153 /* PBXTextBookmark */;
-			611B0BB1116B936C00112153 /* PBXTextBookmark */ = 611B0BB1116B936C00112153 /* PBXTextBookmark */;
-			611B0BB2116B936C00112153 /* PBXTextBookmark */ = 611B0BB2116B936C00112153 /* PBXTextBookmark */;
-			611B0BB3116B936C00112153 /* PBXTextBookmark */ = 611B0BB3116B936C00112153 /* PBXTextBookmark */;
-			611B0BB4116B936C00112153 /* PBXTextBookmark */ = 611B0BB4116B936C00112153 /* PBXTextBookmark */;
-			611B0BB9116B94E600112153 /* PBXTextBookmark */ = 611B0BB9116B94E600112153 /* PBXTextBookmark */;
-			611B0BBA116B94E600112153 /* PBXTextBookmark */ = 611B0BBA116B94E600112153 /* PBXTextBookmark */;
-			611B0BBB116B94E600112153 /* PBXTextBookmark */ = 611B0BBB116B94E600112153 /* PBXTextBookmark */;
-			611B0BBC116B94E600112153 /* PBXTextBookmark */ = 611B0BBC116B94E600112153 /* PBXTextBookmark */;
-			611B0BC0116B94FF00112153 /* PBXTextBookmark */ = 611B0BC0116B94FF00112153 /* PBXTextBookmark */;
-			611B0BC1116B94FF00112153 /* PBXTextBookmark */ = 611B0BC1116B94FF00112153 /* PBXTextBookmark */;
-			611B0BC5116B965100112153 /* PBXTextBookmark */ = 611B0BC5116B965100112153 /* PBXTextBookmark */;
-			611B0BC6116B966A00112153 /* PBXTextBookmark */ = 611B0BC6116B966A00112153 /* PBXTextBookmark */;
-			611B0BC7116B966A00112153 /* PBXTextBookmark */ = 611B0BC7116B966A00112153 /* PBXTextBookmark */;
-			611B0BCE116B978400112153 /* PBXTextBookmark */ = 611B0BCE116B978400112153 /* PBXTextBookmark */;
-			611B0BCF116B978400112153 /* PBXTextBookmark */ = 611B0BCF116B978400112153 /* PBXTextBookmark */;
-			611B0BD0116B978400112153 /* PBXTextBookmark */ = 611B0BD0116B978400112153 /* PBXTextBookmark */;
-			611B0BD1116B978400112153 /* PBXTextBookmark */ = 611B0BD1116B978400112153 /* PBXTextBookmark */;
-			611B0BD3116B979300112153 /* PBXTextBookmark */ = 611B0BD3116B979300112153 /* PBXTextBookmark */;
-			611B0BD4116B979300112153 /* PBXTextBookmark */ = 611B0BD4116B979300112153 /* PBXTextBookmark */;
-			611B0BD7116B97BC00112153 /* PBXTextBookmark */ = 611B0BD7116B97BC00112153 /* PBXTextBookmark */;
-			611B0BD8116B97BC00112153 /* PBXTextBookmark */ = 611B0BD8116B97BC00112153 /* PBXTextBookmark */;
-			611B0BDA116BA0DE00112153 /* PBXTextBookmark */ = 611B0BDA116BA0DE00112153 /* PBXTextBookmark */;
-			611B0BDB116BA0DE00112153 /* PBXTextBookmark */ = 611B0BDB116BA0DE00112153 /* PBXTextBookmark */;
-			611B0BDC116BA0DE00112153 /* PBXTextBookmark */ = 611B0BDC116BA0DE00112153 /* PBXTextBookmark */;
-			611B0BDD116BA0DE00112153 /* PBXTextBookmark */ = 611B0BDD116BA0DE00112153 /* PBXTextBookmark */;
-			611B0BE6116BA1CB00112153 /* PBXTextBookmark */ = 611B0BE6116BA1CB00112153 /* PBXTextBookmark */;
-			611B0BE7116BA1CB00112153 /* XCBuildMessageTextBookmark */ = 611B0BE7116BA1CB00112153 /* XCBuildMessageTextBookmark */;
-			611B0BE8116BA1CB00112153 /* PBXTextBookmark */ = 611B0BE8116BA1CB00112153 /* PBXTextBookmark */;
 			611B0BE9116BA1CC00112153 /* PBXTextBookmark */ = 611B0BE9116BA1CC00112153 /* PBXTextBookmark */;
-			611B0BEA116BA1CC00112153 /* XCBuildMessageTextBookmark */ = 611B0BEA116BA1CC00112153 /* XCBuildMessageTextBookmark */;
-			611B0BEB116BA1CC00112153 /* PBXTextBookmark */ = 611B0BEB116BA1CC00112153 /* PBXTextBookmark */;
-			611B0BEC116BA1CC00112153 /* PBXTextBookmark */ = 611B0BEC116BA1CC00112153 /* PBXTextBookmark */;
-			611B0BED116BA1CC00112153 /* PBXTextBookmark */ = 611B0BED116BA1CC00112153 /* PBXTextBookmark */;
-			611B0BF1116BA20E00112153 /* PBXTextBookmark */ = 611B0BF1116BA20E00112153 /* PBXTextBookmark */;
-			611B0BF2116BA20E00112153 /* PBXTextBookmark */ = 611B0BF2116BA20E00112153 /* PBXTextBookmark */;
-			611B0BF8116BA35600112153 /* PBXTextBookmark */ = 611B0BF8116BA35600112153 /* PBXTextBookmark */;
-			611B0BF9116BA35600112153 /* PBXTextBookmark */ = 611B0BF9116BA35600112153 /* PBXTextBookmark */;
-			611B0BFC116BA38800112153 /* PBXTextBookmark */ = 611B0BFC116BA38800112153 /* PBXTextBookmark */;
-			611B0BFD116BA38800112153 /* PBXTextBookmark */ = 611B0BFD116BA38800112153 /* PBXTextBookmark */;
-			611B0C04116BA53000112153 /* PBXTextBookmark */ = 611B0C04116BA53000112153 /* PBXTextBookmark */;
-			611B0C05116BA53000112153 /* PBXTextBookmark */ = 611B0C05116BA53000112153 /* PBXTextBookmark */;
-			611B0C06116BA53000112153 /* PBXTextBookmark */ = 611B0C06116BA53000112153 /* PBXTextBookmark */;
-			611B0C07116BA53000112153 /* PBXTextBookmark */ = 611B0C07116BA53000112153 /* PBXTextBookmark */;
-			611B0C08116BA53000112153 /* XCBuildMessageTextBookmark */ = 611B0C08116BA53000112153 /* XCBuildMessageTextBookmark */;
-			611B0C09116BA53000112153 /* PBXTextBookmark */ = 611B0C09116BA53000112153 /* PBXTextBookmark */;
-			611B0C0A116BA53E00112153 /* PBXTextBookmark */ = 611B0C0A116BA53E00112153 /* PBXTextBookmark */;
-			611B0C0B116BA53E00112153 /* PBXTextBookmark */ = 611B0C0B116BA53E00112153 /* PBXTextBookmark */;
-			611B0C0C116BA53E00112153 /* PBXTextBookmark */ = 611B0C0C116BA53E00112153 /* PBXTextBookmark */;
-			611B0C0D116BA53E00112153 /* PBXTextBookmark */ = 611B0C0D116BA53E00112153 /* PBXTextBookmark */;
-			611B0C11116BA59A00112153 /* PBXTextBookmark */ = 611B0C11116BA59A00112153 /* PBXTextBookmark */;
-			611B0C12116BA59A00112153 /* PBXTextBookmark */ = 611B0C12116BA59A00112153 /* PBXTextBookmark */;
-			611B0C16116BA61500112153 /* PBXTextBookmark */ = 611B0C16116BA61500112153 /* PBXTextBookmark */;
-			611B0C17116BA61500112153 /* PBXTextBookmark */ = 611B0C17116BA61500112153 /* PBXTextBookmark */;
-			611B0C1B116BA63200112153 /* PBXTextBookmark */ = 611B0C1B116BA63200112153 /* PBXTextBookmark */;
-			611B0C1C116BA63200112153 /* PBXTextBookmark */ = 611B0C1C116BA63200112153 /* PBXTextBookmark */;
-			611B0C20116BA8DC00112153 /* PBXTextBookmark */ = 611B0C20116BA8DC00112153 /* PBXTextBookmark */;
-			611B0C21116BA8DC00112153 /* PBXTextBookmark */ = 611B0C21116BA8DC00112153 /* PBXTextBookmark */;
-			611B0C26116BA90D00112153 /* PBXTextBookmark */ = 611B0C26116BA90D00112153 /* PBXTextBookmark */;
-			611B0C27116BA90D00112153 /* PBXTextBookmark */ = 611B0C27116BA90D00112153 /* PBXTextBookmark */;
-			611B0C2C116BAA4000112153 /* PBXTextBookmark */ = 611B0C2C116BAA4000112153 /* PBXTextBookmark */;
-			611B0C2D116BAA4000112153 /* PBXTextBookmark */ = 611B0C2D116BAA4000112153 /* PBXTextBookmark */;
-			611B0C31116BAACD00112153 /* PBXTextBookmark */ = 611B0C31116BAACD00112153 /* PBXTextBookmark */;
-			611B0C32116BAACD00112153 /* PBXTextBookmark */ = 611B0C32116BAACD00112153 /* PBXTextBookmark */;
-			611B0C33116BAACD00112153 /* PBXTextBookmark */ = 611B0C33116BAACD00112153 /* PBXTextBookmark */;
-			611B0C36116BAB2A00112153 /* PBXTextBookmark */ = 611B0C36116BAB2A00112153 /* PBXTextBookmark */;
-			611B0C37116BAB2A00112153 /* PBXTextBookmark */ = 611B0C37116BAB2A00112153 /* PBXTextBookmark */;
-			611B0C38116BAB2A00112153 /* PBXTextBookmark */ = 611B0C38116BAB2A00112153 /* PBXTextBookmark */;
-			611B0C39116BAB2A00112153 /* PBXTextBookmark */ = 611B0C39116BAB2A00112153 /* PBXTextBookmark */;
-			611B0C3A116BAC7700112153 /* PBXBookmark */ = 611B0C3A116BAC7700112153 /* PBXBookmark */;
 			611B0C42116BAF3A00112153 /* PBXTextBookmark */ = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
-			611B0C43116BAF3A00112153 /* PBXTextBookmark */ = 611B0C43116BAF3A00112153 /* PBXTextBookmark */;
-			611B0C46116BAF3A00112153 /* PBXTextBookmark */ = 611B0C46116BAF3A00112153 /* PBXTextBookmark */;
-			611B0C47116BAF3A00112153 /* PBXTextBookmark */ = 611B0C47116BAF3A00112153 /* PBXTextBookmark */;
-			611B0C48116BAF3A00112153 /* PBXTextBookmark */ = 611B0C48116BAF3A00112153 /* PBXTextBookmark */;
-			611B0C4B116BAF3A00112153 /* PBXTextBookmark */ = 611B0C4B116BAF3A00112153 /* PBXTextBookmark */;
-			611B0C4E116BAF7A00112153 /* PBXTextBookmark */ = 611B0C4E116BAF7A00112153 /* PBXTextBookmark */;
-			611B0C4F116BAF7A00112153 /* XCBuildMessageTextBookmark */ = 611B0C4F116BAF7A00112153 /* XCBuildMessageTextBookmark */;
-			611B0C50116BAF7A00112153 /* PBXTextBookmark */ = 611B0C50116BAF7A00112153 /* PBXTextBookmark */;
-			611B0C57116BAFE300112153 /* PBXTextBookmark */ = 611B0C57116BAFE300112153 /* PBXTextBookmark */;
-			611B0C58116BAFE300112153 /* PBXTextBookmark */ = 611B0C58116BAFE300112153 /* PBXTextBookmark */;
-			611B0C59116BAFE300112153 /* PBXTextBookmark */ = 611B0C59116BAFE300112153 /* PBXTextBookmark */;
-			611B0C5D116BAFF800112153 /* PBXTextBookmark */ = 611B0C5D116BAFF800112153 /* PBXTextBookmark */;
-			611B0C5E116BAFF800112153 /* PBXTextBookmark */ = 611B0C5E116BAFF800112153 /* PBXTextBookmark */;
-			611B0C5F116BAFF800112153 /* PBXTextBookmark */ = 611B0C5F116BAFF800112153 /* PBXTextBookmark */;
-			611B0C63116BB02000112153 /* PBXTextBookmark */ = 611B0C63116BB02000112153 /* PBXTextBookmark */;
-			611B0C64116BB02000112153 /* PBXTextBookmark */ = 611B0C64116BB02000112153 /* PBXTextBookmark */;
-			611B0C65116BB02000112153 /* PBXTextBookmark */ = 611B0C65116BB02000112153 /* PBXTextBookmark */;
-			611B0C69116BB03400112153 /* PBXTextBookmark */ = 611B0C69116BB03400112153 /* PBXTextBookmark */;
-			611B0C6A116BB03400112153 /* PBXTextBookmark */ = 611B0C6A116BB03400112153 /* PBXTextBookmark */;
-			611B0C6B116BB03400112153 /* PBXTextBookmark */ = 611B0C6B116BB03400112153 /* PBXTextBookmark */;
-			611B0C6D116BB0EF00112153 /* PBXTextBookmark */ = 611B0C6D116BB0EF00112153 /* PBXTextBookmark */;
-			611B0C6E116BB0EF00112153 /* PBXTextBookmark */ = 611B0C6E116BB0EF00112153 /* PBXTextBookmark */;
-			611B0C71116BB12800112153 /* PBXTextBookmark */ = 611B0C71116BB12800112153 /* PBXTextBookmark */;
-			611B0C72116BB12800112153 /* PBXTextBookmark */ = 611B0C72116BB12800112153 /* PBXTextBookmark */;
-			611FD81D1155111700C2203D = 611FD81D1155111700C2203D /* PBXTextBookmark */;
-			611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
-			611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */;
-			611FD8211155111700C2203D = 611FD8211155111700C2203D /* PBXTextBookmark */;
-			611FD95711551C3700C2203D = 611FD95711551C3700C2203D /* PBXTextBookmark */;
-			611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* PBXBookmark */;
-			611FD95911551C3700C2203D = 611FD95911551C3700C2203D /* PBXBookmark */;
-			611FD96611551E8000C2203D = 611FD96611551E8000C2203D /* PBXBookmark */;
-			611FDB6C1155C0B300C2203D = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
-			611FDB6D1155C0B300C2203D = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
-			611FDBF71155D39400C2203D = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
-			612D5C451165535400C6D842 = 612D5C451165535400C6D842 /* PBXTextBookmark */;
-			612D616B1165536300C6D842 = 612D616B1165536300C6D842 /* PBXTextBookmark */;
-			612D618F1165545F00C6D842 = 612D618F1165545F00C6D842 /* PBXTextBookmark */;
-			61430D3B1165551600E2C62D = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
-			61430D3D1165551600E2C62D = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
-			615F12CF11655B21002444F2 = 615F12CF11655B21002444F2 /* PBXTextBookmark */;
-			615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */;
-			615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */;
-			615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
-			615F15B9116629A0002444F2 = 615F15B9116629A0002444F2 /* PBXTextBookmark */;
-			615F198C1166A71E002444F2 = 615F198C1166A71E002444F2 /* PBXBookmark */;
-			615F198E1166A71E002444F2 = 615F198E1166A71E002444F2 /* PBXTextBookmark */;
-			615F19911166A71E002444F2 = 615F19911166A71E002444F2 /* PBXTextBookmark */;
-			61697B9E1163478A00CCDF37 = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
-			6179889D114AA5BD00BA94A9 = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
-			61799342114B297000BA94A9 = 61799342114B297000BA94A9 /* PBXBookmark */;
-			61799343114B297000BA94A9 = 61799343114B297000BA94A9 /* PBXBookmark */;
-			6179937111501D7800BA94A9 = 6179937111501D7800BA94A9 /* PBXBookmark */;
-			6179937411501D7800BA94A9 = 6179937411501D7800BA94A9 /* PBXBookmark */;
-			6179937511501D7800BA94A9 = 6179937511501D7800BA94A9 /* PBXBookmark */;
-			6179938511501FFA00BA94A9 = 6179938511501FFA00BA94A9 /* PBXBookmark */;
-			6179943111502CEA00BA94A9 = 6179943111502CEA00BA94A9 /* PBXBookmark */;
-			618AFC07115BE92A003D411B = 618AFC07115BE92A003D411B /* PBXBookmark */;
-			6194CC0711505FCF00A4BA5C = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
-			61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
-			61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
-			61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
-			61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
-			61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
-			61CCBF791161657400833FE8 = 61CCBF791161657400833FE8 /* PBXTextBookmark */;
-			61CCBF7B1161657400833FE8 = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
-			61CCBF7C1161657400833FE8 = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
-			61CCBF7E1161657400833FE8 = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
-			61CCBF7F1161657400833FE8 = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
-			61CCBFD11161833800833FE8 = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
-			61CCBFD21161833800833FE8 = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
-			61CCBFD31161833800833FE8 = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
-			61CCBFD41161833800833FE8 = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
-			61CCBFD51161833800833FE8 = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
-			61CCBFD71161833800833FE8 = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
-			61CCBFD81161833800833FE8 = 61CCBFD81161833800833FE8 /* PBXTextBookmark */;
-			61CCBFD91161833800833FE8 = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
-			61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
-			61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
-			61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
-			61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
-			61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */;
-			61CE2514115E74CC0098C467 = 61CE2514115E74CC0098C467 /* PBXBookmark */;
-			61CE2515115E74CC0098C467 = 61CE2515115E74CC0098C467 /* PBXTextBookmark */;
-			61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */;
-			61CE2577115E78900098C467 = 61CE2577115E78900098C467 /* PBXTextBookmark */;
-			61CEDAA1116ABECE0067BAFC = 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */;
-			61CEDAA2116ABECE0067BAFC = 61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */;
-			61CEDAA3116ABECE0067BAFC = 61CEDAA3116ABECE0067BAFC /* PBXTextBookmark */;
-			61CEDAB7116AC0330067BAFC = 61CEDAB7116AC0330067BAFC /* PBXTextBookmark */;
-			61CEDABB116AC0330067BAFC = 61CEDABB116AC0330067BAFC /* PBXTextBookmark */;
-			61CEDB2A116AC8250067BAFC = 61CEDB2A116AC8250067BAFC /* PBXTextBookmark */;
-			61CEDB37116AC9230067BAFC = 61CEDB37116AC9230067BAFC /* PBXTextBookmark */;
-			61CEDB5F116ACBBB0067BAFC = 61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */;
-			61CEDB60116ACBBB0067BAFC = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
-			61CEDC94116ADCB80067BAFC = 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */;
-			61CEDC95116ADCB80067BAFC = 61CEDC95116ADCB80067BAFC /* PBXTextBookmark */;
-			61CEDCEB116ADFD70067BAFC = 61CEDCEB116ADFD70067BAFC /* PBXTextBookmark */;
-			61CEDCEC116ADFD70067BAFC = 61CEDCEC116ADFD70067BAFC /* PBXTextBookmark */;
-			61CEDD02116AE0D20067BAFC = 61CEDD02116AE0D20067BAFC /* PBXTextBookmark */;
-			61CEDD03116AE0D20067BAFC = 61CEDD03116AE0D20067BAFC /* PBXTextBookmark */;
-			61CEDD04116AE0D20067BAFC = 61CEDD04116AE0D20067BAFC /* PBXTextBookmark */;
-			61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
+			611FD81D1155111700C2203D /* PBXTextBookmark */ = 611FD81D1155111700C2203D /* PBXTextBookmark */;
+			611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */;
+			611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */;
+			611FD8211155111700C2203D /* PBXTextBookmark */ = 611FD8211155111700C2203D /* PBXTextBookmark */;
+			611FD95711551C3700C2203D /* PBXTextBookmark */ = 611FD95711551C3700C2203D /* PBXTextBookmark */;
+			611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */;
+			611FD95911551C3700C2203D /* PBXBookmark */ = 611FD95911551C3700C2203D /* PBXBookmark */;
+			611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */;
+			611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
+			611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
+			611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
+			6122CC91116BE651002648E9 /* PBXTextBookmark */ = 6122CC91116BE651002648E9 /* PBXTextBookmark */;
+			6122CD06116BECE0002648E9 /* PBXTextBookmark */ = 6122CD06116BECE0002648E9 /* PBXTextBookmark */;
+			6122CD07116BECE0002648E9 /* PBXBookmark */ = 6122CD07116BECE0002648E9 /* PBXBookmark */;
+			6122CD09116BED82002648E9 /* PBXBookmark */ = 6122CD09116BED82002648E9 /* PBXBookmark */;
+			612D5C451165535400C6D842 /* PBXTextBookmark */ = 612D5C451165535400C6D842 /* PBXTextBookmark */;
+			612D616B1165536300C6D842 /* PBXTextBookmark */ = 612D616B1165536300C6D842 /* PBXTextBookmark */;
+			612D618F1165545F00C6D842 /* PBXTextBookmark */ = 612D618F1165545F00C6D842 /* PBXTextBookmark */;
+			61430D3B1165551600E2C62D /* PBXTextBookmark */ = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
+			61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
+			615F1316116561BE002444F2 /* PBXTextBookmark */ = 615F1316116561BE002444F2 /* PBXTextBookmark */;
+			615F134D11656569002444F2 /* PBXTextBookmark */ = 615F134D11656569002444F2 /* PBXTextBookmark */;
+			615F147F11659AC5002444F2 /* PBXTextBookmark */ = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
+			615F198C1166A71E002444F2 /* PBXBookmark */ = 615F198C1166A71E002444F2 /* PBXBookmark */;
+			615F198E1166A71E002444F2 /* PBXTextBookmark */ = 615F198E1166A71E002444F2 /* PBXTextBookmark */;
+			615F19911166A71E002444F2 /* PBXTextBookmark */ = 615F19911166A71E002444F2 /* PBXTextBookmark */;
+			61697B9E1163478A00CCDF37 /* PBXTextBookmark */ = 61697B9E1163478A00CCDF37 /* PBXTextBookmark */;
+			6179889D114AA5BD00BA94A9 /* PBXTextBookmark */ = 6179889D114AA5BD00BA94A9 /* PBXTextBookmark */;
+			61799342114B297000BA94A9 /* PBXBookmark */ = 61799342114B297000BA94A9 /* PBXBookmark */;
+			61799343114B297000BA94A9 /* PBXBookmark */ = 61799343114B297000BA94A9 /* PBXBookmark */;
+			6179937111501D7800BA94A9 /* PBXBookmark */ = 6179937111501D7800BA94A9 /* PBXBookmark */;
+			6179937411501D7800BA94A9 /* PBXBookmark */ = 6179937411501D7800BA94A9 /* PBXBookmark */;
+			6179937511501D7800BA94A9 /* PBXBookmark */ = 6179937511501D7800BA94A9 /* PBXBookmark */;
+			6179938511501FFA00BA94A9 /* PBXBookmark */ = 6179938511501FFA00BA94A9 /* PBXBookmark */;
+			6179943111502CEA00BA94A9 /* PBXBookmark */ = 6179943111502CEA00BA94A9 /* PBXBookmark */;
+			618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */;
+			6194CC0711505FCF00A4BA5C /* PlistBookmark */ = 6194CC0711505FCF00A4BA5C /* PlistBookmark */;
+			61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
+			61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
+			61CCBF451161637F00833FE8 /* PBXTextBookmark */ = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF461161637F00833FE8 /* PBXTextBookmark */ = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF471161637F00833FE8 /* PBXTextBookmark */ = 61CCBF471161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF791161657400833FE8 /* PBXTextBookmark */ = 61CCBF791161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7B1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7B1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7C1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7C1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7E1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7E1161657400833FE8 /* PBXTextBookmark */;
+			61CCBF7F1161657400833FE8 /* PBXTextBookmark */ = 61CCBF7F1161657400833FE8 /* PBXTextBookmark */;
+			61CCBFD11161833800833FE8 /* PBXTextBookmark */ = 61CCBFD11161833800833FE8 /* PBXTextBookmark */;
+			61CCBFD21161833800833FE8 /* PBXTextBookmark */ = 61CCBFD21161833800833FE8 /* PBXTextBookmark */;
+			61CCBFD31161833800833FE8 /* PBXTextBookmark */ = 61CCBFD31161833800833FE8 /* PBXTextBookmark */;
+			61CCBFD41161833800833FE8 /* PBXTextBookmark */ = 61CCBFD41161833800833FE8 /* PBXTextBookmark */;
+			61CCBFD51161833800833FE8 /* PBXTextBookmark */ = 61CCBFD51161833800833FE8 /* PBXTextBookmark */;
+			61CCBFD71161833800833FE8 /* PBXTextBookmark */ = 61CCBFD71161833800833FE8 /* PBXTextBookmark */;
+			61CCBFD81161833800833FE8 /* PBXTextBookmark */ = 61CCBFD81161833800833FE8 /* PBXTextBookmark */;
+			61CCBFD91161833800833FE8 /* PBXTextBookmark */ = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
+			61CCBFDA1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
+			61CCBFDB1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
+			61CCBFDC1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
+			61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
+			61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */;
+			61CE2514115E74CC0098C467 /* PBXBookmark */ = 61CE2514115E74CC0098C467 /* PBXBookmark */;
+			61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */;
+			61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */ = 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */;
+			61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */ = 61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */;
+			61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */;
+			61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
+			61CEDC94116ADCB80067BAFC /* PBXTextBookmark */ = 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */;
+			61DFFE27116BC80100EA93BB /* PBXTextBookmark */ = 61DFFE27116BC80100EA93BB /* PBXTextBookmark */;
+			61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
 		userBuildSettings = {
@@ -409,46 +198,6 @@
 			sepNavVisRange = "{106, 119}";
 		};
 	};
-	611B0A95116B622000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
-		name = "DetailViewController.m: 33";
-		rLen = 5;
-		rLoc = 1542;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 7;
-	};
-	611B0A96116B622000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ABF1168D8B600359010 /* SplitViewRootController.h */;
-		name = "SplitViewRootController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 3;
-		vrLoc = 0;
-	};
-	611B0A97116B622000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ABF1168D8B600359010 /* SplitViewRootController.h */;
-		name = "SplitViewRootController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 3;
-		vrLoc = 0;
-	};
-	611B0A9A116B622000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */;
-		name = "PopoverMenuViewController.h: 12";
-		rLen = 21;
-		rLoc = 221;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 0;
-	};
 	611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {999, 641}}";
@@ -464,54 +213,6 @@
 			sepNavWindowFrame = "{{235, 235}, {1058, 792}}";
 		};
 	};
-	611B0AA8116B635B00112153 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'password' undeclared (first use in this function)";
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 230;
-		rType = 1;
-	};
-	611B0AA9116B635B00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 241";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 573;
-		vrLoc = 7006;
-	};
-	611B0AB8116B66BE00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 234";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 565;
-		vrLoc = 6779;
-	};
-	611B0AB9116B66BE00112153 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "SettingsViewController.h: No such file or directory";
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 9;
-		rType = 1;
-	};
-	611B0ABA116B66BE00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 439;
-		vrLoc = 0;
-	};
 	611B0AC6116B6E8B00112153 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61A11ABF1168D8B600359010 /* SplitViewRootController.h */;
@@ -542,887 +243,6 @@
 		vrLen = 3;
 		vrLoc = 0;
 	};
-	611B0AC9116B6E8B00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 234";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 12;
-		vrLoc = 7344;
-	};
-	611B0ACA116B6E8B00112153 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "SettingsViewController.h: No such file or directory";
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 9;
-		rType = 1;
-	};
-	611B0ACB116B6E8B00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0ACE116B6E8B00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 32";
-		rLen = 0;
-		rLoc = 804;
-		rType = 0;
-		vrLen = 957;
-		vrLoc = 0;
-	};
-	611B0ACF116B6E8B00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 29";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1643;
-		vrLoc = 0;
-	};
-	611B0AD0116B6E8B00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 283";
-		rLen = 0;
-		rLoc = 9797;
-		rType = 0;
-		vrLen = 1610;
-		vrLoc = 7593;
-	};
-	611B0AD1116B6E8B00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */;
-		name = "PopoverMenuViewController.h: 12";
-		rLen = 21;
-		rLoc = 221;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 0;
-	};
-	611B0AD9116B6EEA00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0ADA116B6EEA00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 283";
-		rLen = 0;
-		rLoc = 9797;
-		rType = 0;
-		vrLen = 1610;
-		vrLoc = 7593;
-	};
-	611B0ADB116B6EEA00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */;
-		name = "PopoverMenuViewController.h: 12";
-		rLen = 21;
-		rLoc = 221;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 0;
-	};
-	611B0ADF116B6FB200112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 439;
-		vrLoc = 0;
-	};
-	611B0AE0116B6FB300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0AE1116B6FB300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 21";
-		rLen = 0;
-		rLoc = 411;
-		rType = 0;
-		vrLen = 905;
-		vrLoc = 0;
-	};
-	611B0AE2116B6FB300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 71";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1924;
-		vrLoc = 3179;
-	};
-	611B0AE3116B6FB300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 71";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1924;
-		vrLoc = 3179;
-	};
-	611B0AE4116B6FB300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */;
-		name = "PopoverMenuViewController.h: 12";
-		rLen = 21;
-		rLoc = 221;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 0;
-	};
-	611B0AE5116B70A300112153 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-	};
-	611B0AE6116B70D700112153 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
-	};
-	611B0AE9116B70F300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0AEC116B70F300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
-		name = "hwengine.pas: 248";
-		rLen = 0;
-		rLoc = 7235;
-		rType = 0;
-		vrLen = 1072;
-		vrLoc = 6717;
-	};
-	611B0AEF116B70F300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 28";
-		rLen = 0;
-		rLoc = 630;
-		rType = 0;
-		vrLen = 2310;
-		vrLoc = 10515;
-	};
-	611B0AF0116B70F300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 17";
-		rLen = 0;
-		rLoc = 410;
-		rType = 0;
-		vrLen = 822;
-		vrLoc = 0;
-	};
-	611B0AF1116B70F300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 141";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1935;
-		vrLoc = 3415;
-	};
-	611B0AF2116B70F300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 141";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1914;
-		vrLoc = 3415;
-	};
-	611B0AF4116B710800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 439;
-		vrLoc = 0;
-	};
-	611B0AF5116B710E00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 439;
-		vrLoc = 0;
-	};
-	611B0AF6116B710F00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0AF7116B710F00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 28";
-		rLen = 0;
-		rLoc = 630;
-		rType = 0;
-		vrLen = 2310;
-		vrLoc = 10515;
-	};
-	611B0AF8116B710F00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 617987E7114AA34C00BA94A9 /* hwengine.pas */;
-		name = "hwengine.pas: 248";
-		rLen = 0;
-		rLoc = 7235;
-		rType = 0;
-		vrLen = 1137;
-		vrLoc = 6717;
-	};
-	611B0AF9116B710F00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 141";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1935;
-		vrLoc = 3415;
-	};
-	611B0AFA116B717C00112153 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-	};
-	611B0AFD116B71E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0AFE116B71E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 841;
-		vrLoc = 0;
-	};
-	611B0AFF116B71E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 70";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1345;
-		vrLoc = 1525;
-	};
-	611B0B00116B71E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 251";
-		rLen = 0;
-		rLoc = 8422;
-		rType = 0;
-		vrLen = 1271;
-		vrLoc = 6923;
-	};
-	611B0B03116B71E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 841;
-		vrLoc = 0;
-	};
-	611B0B07116B724D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B08116B724D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 256";
-		rLen = 0;
-		rLoc = 8546;
-		rType = 0;
-		vrLen = 1345;
-		vrLoc = 6923;
-	};
-	611B0B09116B724D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 841;
-		vrLoc = 0;
-	};
-	611B0B10116B734500112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B11116B734500112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 265";
-		rLen = 0;
-		rLoc = 9240;
-		rType = 0;
-		vrLen = 1329;
-		vrLoc = 6923;
-	};
-	611B0B12116B734500112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 841;
-		vrLoc = 0;
-	};
-	611B0B16116B759A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B17116B759A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 253";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1750;
-		vrLoc = 7167;
-	};
-	611B0B18116B759A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 841;
-		vrLoc = 0;
-	};
-	611B0B1E116B7A6000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B1F116B7A6000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 20";
-		rLen = 0;
-		rLoc = 468;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B20116B7A6000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 32";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1683;
-		vrLoc = 3;
-	};
-	611B0B21116B7A6000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 222";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1838;
-		vrLoc = 6481;
-	};
-	611B0B22116B7A6000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B26116B7AD400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B27116B7AD400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 21";
-		rLen = 0;
-		rLoc = 556;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 0;
-	};
-	611B0B28116B7AD400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 218";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1781;
-		vrLoc = 5795;
-	};
-	611B0B29116B7AD400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 22";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1698;
-		vrLoc = 32;
-	};
-	611B0B2A116B7AD400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 0;
-	};
-	611B0B2E116B7B0600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B2F116B7B0600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 25";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1746;
-		vrLoc = 32;
-	};
-	611B0B30116B7B0600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 0;
-	};
-	611B0B34116B7B1F00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B35116B7B1F00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 25";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1764;
-		vrLoc = 32;
-	};
-	611B0B36116B7B1F00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 0;
-	};
-	611B0B3A116B7B3200112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B3B116B7B3200112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 213";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1769;
-		vrLoc = 5989;
-	};
-	611B0B3C116B7B3200112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 0;
-	};
-	611B0B42116B7C8D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B43116B7C8D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 225";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1797;
-		vrLoc = 6050;
-	};
-	611B0B44116B7C8D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 0;
-	};
-	611B0B48116B7CA100112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B49116B7CA100112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 225";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1797;
-		vrLoc = 6050;
-	};
-	611B0B4A116B7CA100112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 20";
-		rLen = 0;
-		rLoc = 468;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B4B116B7CA100112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B51116B7CEC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B52116B7CEC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 20";
-		rLen = 0;
-		rLoc = 468;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B53116B7CEC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 47";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1741;
-		vrLoc = 45;
-	};
-	611B0B54116B7CEC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B5F116B7E2400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B60116B7E2400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 229";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1943;
-		vrLoc = 5907;
-	};
-	611B0B61116B7E2400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B65116B7E7900112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B66116B7E7900112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 227";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1950;
-		vrLoc = 5907;
-	};
-	611B0B67116B7E7900112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B6B116B7EAC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B6C116B7EAC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 223";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2114;
-		vrLoc = 5907;
-	};
-	611B0B6D116B7EAC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B71116B7EE000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B72116B7EE000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 236";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2227;
-		vrLoc = 5907;
-	};
-	611B0B73116B7EE000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B77116B7F7300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 1;
-		vrLoc = 172;
-	};
-	611B0B78116B7F7300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 228";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2121;
-		vrLoc = 6422;
-	};
-	611B0B79116B7F7300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
 	611B0B84116B817C00112153 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
@@ -1433,522 +253,6 @@
 		vrLen = 1;
 		vrLoc = 172;
 	};
-	611B0B85116B817C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0B86116B817C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 217";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2028;
-		vrLoc = 5752;
-	};
-	611B0B87116B817C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B89116B8EC300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0B8A116B8EC300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 30";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1722;
-		vrLoc = 0;
-	};
-	611B0B8B116B8EC300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B96116B908C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0B97116B908C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 31";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1745;
-		vrLoc = 0;
-	};
-	611B0B98116B908C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0B9D116B90A700112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0B9E116B90A700112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 31";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1745;
-		vrLoc = 0;
-	};
-	611B0B9F116B90A700112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0BA4116B91BB00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BA5116B91BB00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0BA6116B91BB00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		rLen = 0;
-		rLoc = 9223372036854775807;
-		rType = 0;
-	};
-	611B0BA7116B91BB00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 71";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1184;
-		vrLoc = 1216;
-	};
-	611B0BA9116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 10";
-		rLen = 0;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 439;
-		vrLoc = 0;
-	};
-	611B0BAA116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
-		name = "MainMenuViewController.m: 82";
-		rLen = 0;
-		rLoc = 2873;
-		rType = 0;
-		vrLen = 1184;
-		vrLoc = 2485;
-	};
-	611B0BAB116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
-		name = "OverlayViewController.m: 276";
-		rLen = 0;
-		rLoc = 8807;
-		rType = 0;
-		vrLen = 898;
-		vrLoc = 8506;
-	};
-	611B0BAC116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 240";
-		rLen = 0;
-		rLoc = 9148;
-		rType = 0;
-		vrLen = 717;
-		vrLoc = 8772;
-	};
-	611B0BAD116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 284";
-		rLen = 0;
-		rLoc = 9276;
-		rType = 0;
-		vrLen = 682;
-		vrLoc = 8851;
-	};
-	611B0BAE116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 94";
-		rLen = 0;
-		rLoc = 3702;
-		rType = 0;
-		vrLen = 522;
-		vrLoc = 2381;
-	};
-	611B0BAF116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
-		name = "SplitViewRootController.m: 57";
-		rLen = 0;
-		rLoc = 2604;
-		rType = 0;
-		vrLen = 738;
-		vrLoc = 2158;
-	};
-	611B0BB0116B936A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
-		name = "SplitViewRootController.m: 58";
-		rLen = 0;
-		rLoc = 2604;
-		rType = 0;
-		vrLen = 667;
-		vrLoc = 2108;
-	};
-	611B0BB1116B936C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BB2116B936C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 29";
-		rLen = 0;
-		rLoc = 803;
-		rType = 0;
-		vrLen = 803;
-		vrLoc = 0;
-	};
-	611B0BB3116B936C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 26";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1707;
-		vrLoc = 45;
-	};
-	611B0BB4116B936C00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 26";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1707;
-		vrLoc = 45;
-	};
-	611B0BB9116B94E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BBA116B94E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 21";
-		rLen = 0;
-		rLoc = 468;
-		rType = 0;
-		vrLen = 899;
-		vrLoc = 0;
-	};
-	611B0BBB116B94E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 27";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1689;
-		vrLoc = 45;
-	};
-	611B0BBC116B94E600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 118";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1543;
-		vrLoc = 2270;
-	};
-	611B0BC0116B94FF00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BC1116B94FF00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 118";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1544;
-		vrLoc = 2270;
-	};
-	611B0BC5116B965100112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
-		name = "SplitViewRootController.m: 58";
-		rLen = 0;
-		rLoc = 2604;
-		rType = 0;
-		vrLen = 727;
-		vrLoc = 2108;
-	};
-	611B0BC6116B966A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BC7116B966A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 124";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1729;
-		vrLoc = 48;
-	};
-	611B0BCE116B978400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BCF116B978400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 21";
-		rLen = 0;
-		rLoc = 468;
-		rType = 0;
-		vrLen = 885;
-		vrLoc = 0;
-	};
-	611B0BD0116B978400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 68";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1411;
-		vrLoc = 917;
-	};
-	611B0BD1116B978400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 69";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1508;
-		vrLoc = 672;
-	};
-	611B0BD3116B979300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BD4116B979300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 36";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1532;
-		vrLoc = 672;
-	};
-	611B0BD7116B97BC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BD8116B97BC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 74";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1659;
-		vrLoc = 1051;
-	};
-	611B0BDA116BA0DE00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 2;
-		vrLoc = 1320;
-	};
-	611B0BDB116BA0DE00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 867;
-		vrLoc = 0;
-	};
-	611B0BDC116BA0DE00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 60";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1873;
-		vrLoc = 978;
-	};
-	611B0BDD116BA0DE00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 60";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1873;
-		vrLoc = 978;
-	};
-	611B0BE6116BA1CB00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
-		name = "SplitViewRootController.m: 58";
-		rLen = 0;
-		rLoc = 2604;
-		rType = 0;
-		vrLen = 727;
-		vrLoc = 2108;
-	};
-	611B0BE7116BA1CB00112153 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Expected expression before ',' token";
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 35;
-		rType = 1;
-	};
-	611B0BE8116BA1CB00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 22";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 826;
-		vrLoc = 223;
-	};
 	611B0BE9116BA1CC00112153 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
@@ -1959,398 +263,6 @@
 		vrLen = 2;
 		vrLoc = 1320;
 	};
-	611B0BEA116BA1CC00112153 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Expected expression before ',' token";
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 35;
-		rType = 1;
-	};
-	611B0BEB116BA1CC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 22";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 115;
-		vrLoc = 639;
-	};
-	611B0BEC116BA1CC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 88";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1454;
-		vrLoc = 1972;
-	};
-	611B0BED116BA1CC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 57";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1434;
-		vrLoc = 754;
-	};
-	611B0BF1116BA20E00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 22";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 115;
-		vrLoc = 639;
-	};
-	611B0BF2116BA20E00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 86";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1570;
-		vrLoc = 1995;
-	};
-	611B0BF8116BA35600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 22";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 115;
-		vrLoc = 639;
-	};
-	611B0BF9116BA35600112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 242";
-		rLen = 0;
-		rLoc = 8433;
-		rType = 0;
-		vrLen = 2071;
-		vrLoc = 6749;
-	};
-	611B0BFC116BA38800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 22";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 115;
-		vrLoc = 639;
-	};
-	611B0BFD116BA38800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 45";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1619;
-		vrLoc = 1049;
-	};
-	611B0C04116BA53000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 37";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 904;
-		vrLoc = 466;
-	};
-	611B0C05116BA53000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886F114AA4D000BA94A9 /* MainMenuViewController.m */;
-		name = "MainMenuViewController.m: 75";
-		rLen = 0;
-		rLoc = 2555;
-		rType = 0;
-		vrLen = 1061;
-		vrLoc = 2485;
-	};
-	611B0C06116BA53000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 179";
-		rLen = 0;
-		rLoc = 7069;
-		rType = 0;
-		vrLen = 791;
-		vrLoc = 6660;
-	};
-	611B0C07116BA53000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
-		name = "OverlayViewController.m: 312";
-		rLen = 0;
-		rLoc = 10415;
-		rType = 0;
-		vrLen = 644;
-		vrLoc = 9865;
-	};
-	611B0C08116BA53000112153 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Potential leak of an object allocated on line 56 and stored into 'detailedNavController'";
-		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 60;
-		rType = 1;
-	};
-	611B0C09116BA53000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
-		name = "SplitViewRootController.m: 58";
-		rLen = 0;
-		rLoc = 2643;
-		rType = 0;
-		vrLen = 671;
-		vrLoc = 2158;
-	};
-	611B0C0A116BA53E00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 37";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 540;
-	};
-	611B0C0B116BA53E00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 30";
-		rLen = 0;
-		rLoc = 802;
-		rType = 0;
-		vrLen = 811;
-		vrLoc = 0;
-	};
-	611B0C0C116BA53E00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 154";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1501;
-		vrLoc = 9412;
-	};
-	611B0C0D116BA53E00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 154";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2167;
-		vrLoc = 5205;
-	};
-	611B0C11116BA59A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 37";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 540;
-	};
-	611B0C12116BA59A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 193";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2278;
-		vrLoc = 5545;
-	};
-	611B0C16116BA61500112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 37";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 540;
-	};
-	611B0C17116BA61500112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 207";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2522;
-		vrLoc = 5545;
-	};
-	611B0C1B116BA63200112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 37";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 540;
-	};
-	611B0C1C116BA63200112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 205";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2568;
-		vrLoc = 5545;
-	};
-	611B0C20116BA8DC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 37";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 540;
-	};
-	611B0C21116BA8DC00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 39";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1592;
-		vrLoc = 0;
-	};
-	611B0C26116BA90D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 37";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 540;
-	};
-	611B0C27116BA90D00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 77";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1515;
-		vrLoc = 1537;
-	};
-	611B0C2C116BAA4000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 36";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 539;
-	};
-	611B0C2D116BAA4000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 71";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1731;
-		vrLoc = 1538;
-	};
-	611B0C31116BAACD00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 36";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 94;
-		vrLoc = 539;
-	};
-	611B0C32116BAACD00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 170";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1594;
-		vrLoc = 1995;
-	};
-	611B0C33116BAACD00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 170";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 1594;
-		vrLoc = 1995;
-	};
-	611B0C36116BAB2A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 246";
-		rLen = 0;
-		rLoc = 8420;
-		rType = 0;
-		vrLen = 75;
-		vrLoc = 631;
-	};
-	611B0C37116BAB2A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
-		name = "GeneralSettingsViewController.h: 25";
-		rLen = 0;
-		rLoc = 666;
-		rType = 0;
-		vrLen = 809;
-		vrLoc = 0;
-	};
-	611B0C38116BAB2A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 170";
-		rLen = 0;
-		rLoc = 330;
-		rType = 0;
-		vrLen = 2101;
-		vrLoc = 6539;
-	};
-	611B0C39116BAB2A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
-		name = "GeneralSettingsViewController.m: 216";
-		rLen = 0;
-		rLoc = 7055;
-		rType = 0;
-		vrLen = 2087;
-		vrLoc = 6622;
-	};
-	611B0C3A116BAC7700112153 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-	};
 	611B0C42116BAF3A00112153 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */;
@@ -2361,245 +273,6 @@
 		vrLen = 75;
 		vrLoc = 631;
 	};
-	611B0C43116BAF3A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 3;
-	};
-	611B0C46116BAF3A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
-		name = "SingleTeamViewController.h: 23";
-		rLen = 0;
-		rLoc = 523;
-		rType = 0;
-		vrLen = 633;
-		vrLoc = 0;
-	};
-	611B0C47116BAF3A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 116";
-		rLen = 0;
-		rLoc = 4575;
-		rType = 0;
-		vrLen = 1788;
-		vrLoc = 0;
-	};
-	611B0C48116BAF3A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 50";
-		rLen = 0;
-		rLoc = 2062;
-		rType = 0;
-		vrLen = 2050;
-		vrLoc = 734;
-	};
-	611B0C4B116BAF3A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 26";
-		rLen = 0;
-		rLoc = 771;
-		rType = 0;
-		vrLen = 1793;
-		vrLoc = 152;
-	};
-	611B0C4E116BAF7A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
-		name = "SplitViewRootController.m: 58";
-		rLen = 0;
-		rLoc = 2643;
-		rType = 0;
-		vrLen = 674;
-		vrLoc = 2158;
-	};
-	611B0C4F116BAF7A00112153 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "Compile /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/../../cocoaTouch/SingleTeamViewController.m";
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 0;
-		rLoc = 52;
-		rType = 1;
-	};
-	611B0C50116BAF7A00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 48";
-		rLen = 0;
-		rLoc = 1907;
-		rType = 0;
-		vrLen = 1223;
-		vrLoc = 1313;
-	};
-	611B0C57116BAFE300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 3;
-	};
-	611B0C58116BAFE300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 53";
-		rLen = 0;
-		rLoc = 2216;
-		rType = 0;
-		vrLen = 2113;
-		vrLoc = 734;
-	};
-	611B0C59116BAFE300112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 23";
-		rLen = 107;
-		rLoc = 465;
-		rType = 0;
-		vrLen = 1793;
-		vrLoc = 152;
-	};
-	611B0C5D116BAFF800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 3;
-	};
-	611B0C5E116BAFF800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 52";
-		rLen = 0;
-		rLoc = 2185;
-		rType = 0;
-		vrLen = 2082;
-		vrLoc = 661;
-	};
-	611B0C5F116BAFF800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 23";
-		rLen = 107;
-		rLoc = 465;
-		rType = 0;
-		vrLen = 1793;
-		vrLoc = 152;
-	};
-	611B0C63116BB02000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 3;
-	};
-	611B0C64116BB02000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 53";
-		rLen = 0;
-		rLoc = 2281;
-		rType = 0;
-		vrLen = 2104;
-		vrLoc = 661;
-	};
-	611B0C65116BB02000112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 23";
-		rLen = 107;
-		rLoc = 465;
-		rType = 0;
-		vrLen = 1793;
-		vrLoc = 152;
-	};
-	611B0C69116BB03400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 3;
-	};
-	611B0C6A116BB03400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 52";
-		rLen = 0;
-		rLoc = 2214;
-		rType = 0;
-		vrLen = 2108;
-		vrLoc = 661;
-	};
-	611B0C6B116BB03400112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 23";
-		rLen = 107;
-		rLoc = 465;
-		rType = 0;
-		vrLen = 1793;
-		vrLoc = 152;
-	};
-	611B0C6D116BB0EF00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 3;
-	};
-	611B0C6E116BB0EF00112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 23";
-		rLen = 107;
-		rLoc = 465;
-		rType = 0;
-		vrLen = 1793;
-		vrLoc = 152;
-	};
-	611B0C71116BB12800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 27;
-		vrLoc = 3;
-	};
-	611B0C72116BB12800112153 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 45";
-		rLen = 0;
-		rLoc = 1549;
-		rType = 0;
-		vrLen = 1793;
-		vrLoc = 152;
-	};
 	611FD81D1155111700C2203D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6179885B114AA48A00BA94A9 /* SDL_image.h */;
@@ -2680,6 +353,34 @@
 		vrLen = 201;
 		vrLoc = 686;
 	};
+	6122CC91116BE651002648E9 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 74";
+		rLen = 0;
+		rLoc = 3009;
+		rType = 0;
+		vrLen = 146;
+		vrLoc = 2772;
+	};
+	6122CD06116BECE0002648E9 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
+		name = "OverlayViewController.m: 17";
+		rLen = 0;
+		rLoc = 391;
+		rType = 0;
+		vrLen = 247;
+		vrLoc = 0;
+	};
+	6122CD07116BECE0002648E9 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */;
+	};
+	6122CD09116BED82002648E9 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */;
+	};
 	612D5C451165535400C6D842 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */;
@@ -2730,16 +431,6 @@
 		vrLen = 3;
 		vrLoc = 0;
 	};
-	615F12CF11655B21002444F2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798874114AA4D000BA94A9 /* SettingsViewController.h */;
-		name = "SettingsViewController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 128;
-		vrLoc = 45;
-	};
 	615F1316116561BE002444F2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */;
@@ -2770,16 +461,6 @@
 		vrLen = 150;
 		vrLoc = 12762;
 	};
-	615F15B9116629A0002444F2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798888114AA4E600BA94A9 /* GameSetup.m */;
-		name = "GameSetup.m: 84";
-		rLen = 0;
-		rLoc = 3164;
-		rType = 0;
-		vrLen = 206;
-		vrLoc = 1116;
-	};
 	615F198C1166A71E002444F2 /* PBXBookmark */ = {
 		isa = PBXBookmark;
 		fRef = 611FD9CF1155A40700C2203D /* NetworkPlay.png */;
@@ -3272,28 +953,12 @@
 	};
 	6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {831, 2431}}";
-			sepNavSelRange = "{2555, 0}";
-			sepNavVisRange = "{2485, 1061}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 2483}}";
+			sepNavSelRange = "{2834, 0}";
+			sepNavVisRange = "{1602, 2823}";
 			sepNavWindowFrame = "{{260, 136}, {1058, 792}}";
 		};
 	};
-	61798874114AA4D000BA94A9 /* SettingsViewController.h */ = {
-		isa = PBXFileReference;
-		fileEncoding = 4;
-		lastKnownFileType = sourcecode.c.h;
-		name = SettingsViewController.h;
-		path = /Users/vittorio/hedgewars/trunk/cocoaTouch/SettingsViewController.h;
-		sourceTree = "<absolute>";
-	};
-	61798875114AA4D000BA94A9 /* SettingsViewController.m */ = {
-		isa = PBXFileReference;
-		fileEncoding = 4;
-		lastKnownFileType = sourcecode.c.objc;
-		name = SettingsViewController.m;
-		path = /Users/vittorio/hedgewars/trunk/cocoaTouch/SettingsViewController.m;
-		sourceTree = "<absolute>";
-	};
 	61798887114AA4E600BA94A9 /* GameSetup.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {572, 416}}";
@@ -3423,11 +1088,19 @@
 			sepNavWindowFrame = "{{322, 221}, {1058, 792}}";
 		};
 	};
+	61A11ACD1168DB1B00359010 /* TeamSettingsViewController.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
+			sepNavSelRange = "{299, 0}";
+			sepNavVisRange = "{0, 400}";
+			sepNavWindowFrame = "{{730, 203}, {1058, 792}}";
+		};
+	};
 	61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 2223}}";
-			sepNavSelRange = "{854, 0}";
-			sepNavVisRange = "{0, 1759}";
+			sepNavIntBoundsRect = "{{0, 0}, {1048, 2093}}";
+			sepNavSelRange = "{1676, 0}";
+			sepNavVisRange = "{279, 2094}";
 			sepNavWindowFrame = "{{245, 171}, {1058, 792}}";
 		};
 	};
@@ -3449,33 +1122,32 @@
 	};
 	61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 641}}";
-			sepNavSelRange = "{523, 0}";
-			sepNavVisRange = "{0, 633}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 639}}";
+			sepNavSelRange = "{394, 0}";
+			sepNavVisRange = "{0, 617}";
 		};
 	};
 	61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1111, 2938}}";
-			sepNavSelRange = "{1907, 0}";
-			sepNavVisRange = "{661, 2155}";
+			sepNavIntBoundsRect = "{{0, 0}, {1111, 3289}}";
+			sepNavSelRange = "{7429, 0}";
+			sepNavVisRange = "{3042, 1256}";
 			sepNavWindowFrame = "{{530, 146}, {1058, 792}}";
 		};
 	};
 	61A11AE21168DC9400359010 /* HogHatViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
-			sepNavSelRange = "{395, 10}";
-			sepNavVisRange = "{0, 461}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 641}}";
+			sepNavSelRange = "{466, 0}";
+			sepNavVisRange = "{0, 652}";
 		};
 	};
 	61A11AE31168DC9400359010 /* HogHatViewController.m */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            l = DetailViewController;\n            r = \"{5352, 24}\";\n            s = 1;\n        },\n                {\n            l = DetailViewController;\n            r = \"{5403, 24}\";\n            s = 1;\n        },\n                {\n            l = \"Nib name\";\n            r = \"{5453, 12}\";\n            s = 1;\n        }\n    );\n    r = \"{0, 6262}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {999, 2639}}";
-			sepNavSelRange = "{1549, 0}";
-			sepNavVisRange = "{152, 1793}";
-			sepNavWindowFrame = "{{334, 295}, {1058, 792}}";
+			sepNavIntBoundsRect = "{{0, 0}, {544, 2873}}";
+			sepNavSelRange = "{301, 0}";
+			sepNavVisRange = "{0, 726}";
+			sepNavWindowFrame = "{{861, 250}, {1058, 792}}";
 		};
 	};
 	61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = {
@@ -3712,9 +1384,9 @@
 	};
 	61CE250C115E749A0098C467 /* OverlayViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {985, 4290}}";
-			sepNavSelRange = "{10415, 0}";
-			sepNavVisRange = "{9865, 644}";
+			sepNavIntBoundsRect = "{{0, 0}, {985, 4238}}";
+			sepNavSelRange = "{391, 0}";
+			sepNavVisRange = "{0, 247}";
 			sepNavWindowFrame = "{{690, 149}, {938, 967}}";
 		};
 	};
@@ -3722,30 +1394,10 @@
 		isa = PBXBookmark;
 		fRef = 61798A2B114ADD2600BA94A9 /* title.png */;
 	};
-	61CE2515115E74CC0098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 6179886E114AA4D000BA94A9 /* MainMenuViewController.h */;
-		name = "MainMenuViewController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 148;
-		vrLoc = 0;
-	};
 	61CE251F115E75A70098C467 /* PBXBookmark */ = {
 		isa = PBXBookmark;
 		fRef = 61798A28114ADD2600BA94A9 /* playButton.png */;
 	};
-	61CE2577115E78900098C467 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61798875114AA4D000BA94A9 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 94";
-		rLen = 0;
-		rLoc = 2739;
-		rType = 0;
-		vrLen = 167;
-		vrLoc = 2736;
-	};
 	61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61A11AC01168D8B600359010 /* SplitViewRootController.m */;
@@ -3766,56 +1418,6 @@
 		vrLen = 62;
 		vrLoc = 85;
 	};
-	61CEDAA3116ABECE0067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 13";
-		rLen = 0;
-		rLoc = 325;
-		rType = 0;
-		vrLen = 26;
-		vrLoc = 384;
-	};
-	61CEDAB7116AC0330067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 114";
-		rLen = 0;
-		rLoc = 3700;
-		rType = 0;
-		vrLen = 30;
-		vrLoc = 0;
-	};
-	61CEDABB116AC0330067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */;
-		name = "PopoverMenuViewController.h: 13";
-		rLen = 8;
-		rLoc = 282;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 0;
-	};
-	61CEDB2A116AC8250067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */;
-		name = "PopoverMenuViewController.m: 24";
-		rLen = 0;
-		rLoc = 633;
-		rType = 0;
-		vrLen = 1703;
-		vrLoc = 1056;
-	};
-	61CEDB37116AC9230067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
-		name = "OverlayViewController.m: 17";
-		rLen = 0;
-		rLoc = 391;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
 	61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61A11A4D1168D13600359010 /* PopoverMenuViewController.m */;
@@ -3846,66 +1448,16 @@
 		vrLen = 0;
 		vrLoc = 0;
 	};
-	61CEDC95116ADCB80067BAFC /* PBXTextBookmark */ = {
+	61DFFE27116BC80100EA93BB /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
-		name = "DetailViewController.m: 33";
-		rLen = 5;
-		rLoc = 1542;
+		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
+		name = "HogHatViewController.m: 110";
+		rLen = 0;
+		rLoc = 3885;
 		rType = 0;
 		vrLen = 0;
 		vrLoc = 0;
 	};
-	61CEDCEB116ADFD70067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE250B115E749A0098C467 /* OverlayViewController.h */;
-		name = "OverlayViewController.h: 16";
-		rLen = 0;
-		rLoc = 354;
-		rType = 0;
-		vrLen = 1083;
-		vrLoc = 0;
-	};
-	61CEDCEC116ADFD70067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
-		name = "OverlayViewController.m: 181";
-		rLen = 20;
-		rLoc = 6145;
-		rType = 0;
-		vrLen = 1917;
-		vrLoc = 5549;
-	};
-	61CEDD02116AE0D20067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
-		name = "DetailViewController.m: 33";
-		rLen = 5;
-		rLoc = 1542;
-		rType = 0;
-		vrLen = 34;
-		vrLoc = 0;
-	};
-	61CEDD03116AE0D20067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */;
-		name = "OverlayViewController.m: 160";
-		rLen = 0;
-		rLoc = 5098;
-		rType = 0;
-		vrLen = 2739;
-		vrLoc = 4085;
-	};
-	61CEDD04116AE0D20067BAFC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11A4C1168D13600359010 /* PopoverMenuViewController.h */;
-		name = "PopoverMenuViewController.h: 12";
-		rLen = 21;
-		rLoc = 221;
-		rType = 0;
-		vrLen = 367;
-		vrLoc = 0;
-	};
 	61E2F0811156B170002D33C1 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 617987F6114AA34C00BA94A9 /* uChat.pas */;