add support to editing hog names
authorkoda
Fri, 09 Apr 2010 21:08:27 +0000
changeset 3329 d8e41ee0b3ae
parent 3328 fe87c2242984
child 3330 987ec27b6042
add support to editing hog names
cocoaTouch/SingleTeamViewController.h
cocoaTouch/SingleTeamViewController.m
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/cocoaTouch/SingleTeamViewController.h	Fri Apr 09 11:09:26 2010 +0000
+++ b/cocoaTouch/SingleTeamViewController.h	Fri Apr 09 21:08:27 2010 +0000
@@ -9,8 +9,11 @@
 #import <UIKit/UIKit.h>
 
 @class HogHatViewController;
-@interface SingleTeamViewController : UITableViewController {
+@interface SingleTeamViewController : UITableViewController <UITextFieldDelegate> {
     NSMutableDictionary *teamDictionary;
+    
+    UITextField *textFieldBeingEdited;
+    NSInteger selectedHog;
     NSArray *hatArray;
     
     NSArray *secondaryItems;
@@ -21,6 +24,7 @@
 }
 
 @property (nonatomic,retain) NSMutableDictionary *teamDictionary;
+@property (nonatomic,retain) UITextField *textFieldBeingEdited;
 @property (nonatomic,retain) NSArray *hatArray;
 @property (nonatomic,retain) NSArray *secondaryItems;
 @property (nonatomic,retain) NSArray *secondaryControllers;
--- a/cocoaTouch/SingleTeamViewController.m	Fri Apr 09 11:09:26 2010 +0000
+++ b/cocoaTouch/SingleTeamViewController.m	Fri Apr 09 21:08:27 2010 +0000
@@ -7,24 +7,86 @@
 //
 
 #import "SingleTeamViewController.h"
+//#import "HogNameViewController.h"
 #import "HogHatViewController.h"
 #import "FlagsViewController.h"
 #import "FortsViewController.h"
 #import "CommodityFunctions.h"
 
 @implementation SingleTeamViewController
-@synthesize teamDictionary, hatArray, secondaryItems, secondaryControllers;
+@synthesize teamDictionary, hatArray, secondaryItems, secondaryControllers, textFieldBeingEdited;
 
 
 -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
     return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
 }
 
+
+#pragma mark -
+#pragma mark textfield methods
+// return to previous table
+-(void) cancel:(id) sender {
+    if (textFieldBeingEdited != nil)
+        [self.textFieldBeingEdited resignFirstResponder];
+}
+
+// set the new value
+-(void) save:(id) sender {
+    if (textFieldBeingEdited != nil) {
+        //replace the old value with the new one
+        NSDictionary *oldHog = [[teamDictionary objectForKey:@"hedgehogs"] objectAtIndex:selectedHog];
+        NSMutableDictionary *newHog = [[NSMutableDictionary alloc] initWithDictionary: oldHog];
+        [newHog setObject:textFieldBeingEdited.text forKey:@"hogname"];
+        [[teamDictionary objectForKey:@"hedgehogs"] replaceObjectAtIndex:selectedHog withObject:newHog];
+        [newHog release];
+        
+        isWriteNeeded = YES;
+        [self.textFieldBeingEdited resignFirstResponder];
+    }
+}
+
+// the textfield is being modified, update the navigation controller
+-(void) textFieldDidBeginEditing:(UITextField *)aTextField{
+    self.textFieldBeingEdited = aTextField;
+    selectedHog = aTextField.tag;
+    UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Cancel",@"from the hog name table")
+                                                                     style:UIBarButtonItemStylePlain
+                                                                    target:self
+                                                                    action:@selector(cancel:)];
+    self.navigationItem.leftBarButtonItem = cancelButton;
+    [cancelButton release];
+    
+    UIBarButtonItem *saveButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Save",@"from the hog name table")
+                                                                     style:UIBarButtonItemStyleDone
+                                                                    target:self
+                                                                    action:@selector(save:)];
+    self.navigationItem.rightBarButtonItem = saveButton;
+    [saveButton release];
+}
+
+// the textfield has been modified, check for empty strings and restore original navigation bar
+-(void) textFieldDidEndEditing:(UITextField *)aTextField{
+    if ([textFieldBeingEdited.text length] == 0) 
+        textFieldBeingEdited.text = [NSString stringWithFormat:@"hedgehog %d",textFieldBeingEdited.tag];
+
+    self.textFieldBeingEdited = nil;
+    self.navigationItem.rightBarButtonItem = self.navigationItem.backBarButtonItem;
+    self.navigationItem.leftBarButtonItem = nil;
+}
+
+// limit the size of the field to 64 characters like in original frontend
+-(BOOL) textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+    int limit = 64;
+    return !([textField.text length] > limit && [string length] > range.length);
+}
+
+
 #pragma mark -
 #pragma mark View lifecycle
 - (void)viewDidLoad {
     [super viewDidLoad];
    
+    // labels for the entries
     NSMutableArray *array = [[NSMutableArray alloc] initWithObjects:
                              NSLocalizedString(@"Grave",@""),
                              NSLocalizedString(@"Voice",@""),
@@ -56,7 +118,7 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
-    // load data about the team and extract info
+    // load data about the team and write if there has been a change
     NSString *teamFile = [[NSString alloc] initWithFormat:@"%@/%@.plist",TEAMS_DIRECTORY(),self.title];
     if (isWriteNeeded) {
         [self.teamDictionary writeToFile:teamFile atomically:YES];
@@ -67,7 +129,6 @@
 	NSMutableDictionary *teamDict = [[NSMutableDictionary alloc] initWithContentsOfFile:teamFile];
     self.teamDictionary = teamDict;
     [teamDict release];
-    
 	[teamFile release];
         
     // load the images of the hat for aach hog
@@ -93,6 +154,7 @@
     [self.tableView reloadData];
 }
 
+// write on file if there has been a change
 -(void) viewWillDisappear:(BOOL)animated {
 	[super viewWillDisappear:animated];
 	
@@ -105,6 +167,7 @@
 
 	[teamFile release];
 }
+
 // needed by other classes to warn about a user change
 -(void) setWriteNeeded {
     isWriteNeeded = YES;
@@ -141,9 +204,22 @@
     if (cell == nil) {
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault 
                                        reuseIdentifier:CellIdentifier] autorelease];
+        if ([indexPath section] == 1) {
+            // create a uitextfield for each row, expand it to take the maximum size
+            UITextField *aTextField = [[UITextField alloc] 
+                                       initWithFrame:CGRectMake(42, 12, (cell.frame.size.width + cell.frame.size.width/3) - 42, 25)];
+            aTextField.clearsOnBeginEditing = NO;
+            aTextField.returnKeyType = UIReturnKeyDone;
+            aTextField.adjustsFontSizeToFitWidth = YES;
+            aTextField.delegate = self;
+            aTextField.font = [UIFont boldSystemFontOfSize:[UIFont systemFontSize] + 2];
+            aTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
+            [aTextField addTarget:self action:@selector(save:) forControlEvents:UIControlEventEditingDidEndOnExit];
+            [cell.contentView addSubview:aTextField];
+            [aTextField release];
+        }
     }
 
-
     NSArray *hogArray;
     NSInteger row = [indexPath row];
     switch ([indexPath section]) {
@@ -154,8 +230,18 @@
             break;
         case 1:
             hogArray = [self.teamDictionary objectForKey:@"hedgehogs"];
-            cell.textLabel.text = [[hogArray objectAtIndex:row] objectForKey:@"hogname"];
+
             cell.imageView.image = [self.hatArray objectAtIndex:row];
+            
+            for (UIView *oneView in cell.contentView.subviews) {
+                if ([oneView isMemberOfClass:[UITextField class]]) {
+                    // we find the uitextfied and we'll use its tag to understand which one is being edited
+                    UITextField *textFieldFound = (UITextField *)oneView;
+                    textFieldFound.text = [[hogArray objectAtIndex:row] objectForKey:@"hogname"];
+                    textFieldFound.tag = row;
+                }
+            }
+
             cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton;
             break;
         case 2:
@@ -179,62 +265,32 @@
 }
 
 
-/*
-// Override to support conditional editing of the table view.
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
-    // Return NO if you do not want the specified item to be editable.
-    return YES;
-}
-*/
-
-/*
-// Override to support editing the table view.
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle
- forRowAtIndexPath:(NSIndexPath *)indexPath {
-    
-    if (editingStyle == UITableViewCellEditingStyleDelete) {
-        // Delete the row from the data source
-        [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES];
-    }   
-    else if (editingStyle == UITableViewCellEditingStyleInsert) {
-        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
-    }   
-}
-*/
-
-/*
-// Override to support rearranging the table view.
-- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
-}
-*/
-
-
-/*
-// Override to support conditional rearranging of the table view.
-- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
-    // Return NO if you do not want the item to be re-orderable.
-    return YES;
-}
-*/
-
-
 #pragma mark -
 #pragma mark Table view delegate
--(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     NSInteger row = [indexPath row];
     UITableViewController *nextController;
     if (1 == [indexPath section]) {
-        //TODO: hog name pref, causes segfault
+        UITableViewCell *cell = [aTableView cellForRowAtIndexPath:indexPath];
+        for (UIView *oneView in cell.contentView.subviews) {
+            if ([oneView isMemberOfClass:[UITextField class]]) {
+                textFieldBeingEdited = (UITextField *)oneView;
+                textFieldBeingEdited.tag = row;
+                [textFieldBeingEdited becomeFirstResponder];
+            }
+        }
+        [aTableView deselectRowAtIndexPath:indexPath animated:NO];
     }
     if (2 == [indexPath section]) {
         //TODO: this part should be rewrittend with lazy loading instead of an array of controllers
         nextController = [secondaryControllers objectAtIndex:row%2 ];              //TODO: fix the objectAtIndex
         nextController.title = [secondaryItems objectAtIndex:row];
         [nextController setTeamDictionary:teamDictionary];
+        [self.navigationController pushViewController:nextController animated:YES];
     }
-    [self.navigationController pushViewController:nextController animated:YES];
 }
 
+// action to perform when you want to change a hog hat
 -(void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath {
     if (nil == hogChildController) {
         hogChildController = [[HogHatViewController alloc] initWithStyle:UITableViewStyleGrouped];
@@ -257,18 +313,22 @@
 }
 
 -(void) viewDidUnload {
-    self.secondaryControllers = nil;
+    self.teamDictionary = nil;
+    self.textFieldBeingEdited = nil;
+    self.hatArray = nil;
     self.secondaryItems = nil;
-    self.hatArray = nil;
-    self.teamDictionary = nil;
+    self.secondaryControllers = nil;
+    hogChildController = nil;
     [super viewDidUnload];
 }
 
 -(void) dealloc {
-    [secondaryControllers release];
+    [teamDictionary release];
+    [textFieldBeingEdited release];
+    [hatArray release];
     [secondaryItems release];
-    [hatArray release];
-    [teamDictionary release];
+    [secondaryControllers release];
+    [hogChildController release];
     [super dealloc];
 }
 
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj	Fri Apr 09 11:09:26 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj	Fri Apr 09 21:08:27 2010 +0000
@@ -29,6 +29,7 @@
 		6122CD01116BECCA002648E9 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6122CD00116BECCA002648E9 /* Default-Landscape.png */; };
 		6151347E116C2803001F16D1 /* Icon-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6151347D116C2803001F16D1 /* Icon-iPad.png */; };
 		615134B1116C2C5F001F16D1 /* OverlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 615134B0116C2C5F001F16D1 /* OverlayViewController.xib */; };
+		6157F7FC116F466F005E4A26 /* HogNameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6157F7FB116F466F005E4A26 /* HogNameViewController.m */; };
 		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 */; };
@@ -190,6 +191,8 @@
 		6122CD00116BECCA002648E9 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "../../cocoaTouch/resources/Default-Landscape.png"; sourceTree = SOURCE_ROOT; };
 		6151347D116C2803001F16D1 /* Icon-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-iPad.png"; path = "../../cocoaTouch/resources/Icon-iPad.png"; sourceTree = SOURCE_ROOT; };
 		615134B0116C2C5F001F16D1 /* OverlayViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OverlayViewController.xib; path = ../../cocoaTouch/xib/OverlayViewController.xib; sourceTree = SOURCE_ROOT; };
+		6157F7FA116F466F005E4A26 /* HogNameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HogNameViewController.h; path = ../../cocoaTouch/HogNameViewController.h; sourceTree = SOURCE_ROOT; };
+		6157F7FB116F466F005E4A26 /* HogNameViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HogNameViewController.m; path = ../../cocoaTouch/HogNameViewController.m; 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; };
@@ -550,6 +553,17 @@
 			name = buttons;
 			sourceTree = "<group>";
 		};
+		6188FE09116F67C7004F3690 /* Hogs */ = {
+			isa = PBXGroup;
+			children = (
+				61A11AE21168DC9400359010 /* HogHatViewController.h */,
+				61A11AE31168DC9400359010 /* HogHatViewController.m */,
+				6157F7FA116F466F005E4A26 /* HogNameViewController.h */,
+				6157F7FB116F466F005E4A26 /* HogNameViewController.m */,
+			);
+			name = Hogs;
+			sourceTree = "<group>";
+		};
 		61A118481168371400359010 /* Frontend */ = {
 			isa = PBXGroup;
 			children = (
@@ -586,8 +600,7 @@
 				61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */,
 				61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */,
 				61A11AE01168DC6E00359010 /* SingleTeamViewController.m */,
-				61A11AE21168DC9400359010 /* HogHatViewController.h */,
-				61A11AE31168DC9400359010 /* HogHatViewController.m */,
+				6188FE09116F67C7004F3690 /* Hogs */,
 				619C5230116E4E800049FD84 /* FlagsViewController.h */,
 				619C5231116E4E810049FD84 /* FlagsViewController.m */,
 				619C533C116E70050049FD84 /* FortsViewController.h */,
@@ -916,6 +929,7 @@
 				619C5232116E4E810049FD84 /* FlagsViewController.m in Sources */,
 				619C533E116E70050049FD84 /* FortsViewController.m in Sources */,
 				619C58AB116E752A0049FD84 /* UIImageScale.m in Sources */,
+				6157F7FC116F466F005E4A26 /* HogNameViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Fri Apr 09 11:09:26 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Fri Apr 09 21:08:27 2010 +0000
@@ -202,7 +202,7 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>6157F7BD116F3B2D005E4A26</string>
+				<string>6188FE8E116F8291004F3690</string>
 				<key>PBXProjectModuleLabel</key>
 				<string>SingleTeamViewController.m</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
@@ -210,16 +210,17 @@
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>6157F7BE116F3B2D005E4A26</string>
+						<string>6188FE8F116F8291004F3690</string>
 						<key>PBXProjectModuleLabel</key>
 						<string>SingleTeamViewController.m</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>6157F7F8116F4233005E4A26</string>
+						<string>6188FFD8116FCEC1004F3690</string>
 						<key>history</key>
 						<array>
-							<string>6157F7B7116F3B07005E4A26</string>
+							<string>6188FFD3116FCE9F004F3690</string>
+							<string>6188FFD4116FCE9F004F3690</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -235,7 +236,48 @@
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>405 202 1058 736 0 0 1920 1178 </string>
+				<string>145 320 1058 736 0 0 1920 1178 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>6188FE1A116F6D44004F3690</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>HogNameViewController.m</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>6188FE1B116F6D44004F3690</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>HogNameViewController.m</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>6188FFD9116FCEC1004F3690</string>
+						<key>history</key>
+						<array>
+							<string>6188FE93116F8291004F3690</string>
+							<string>6188FE94116F8291004F3690</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}, {1002, 681}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>822 328 1002 722 0 0 1920 1178 </string>
 			</dict>
 		</dict>
 	</array>
@@ -312,6 +354,8 @@
 								<string>61A11AC31168DA2B00359010</string>
 								<string>611B0A94116B621600112153</string>
 								<string>61A11AD01168DB1F00359010</string>
+								<string>6188FE09116F67C7004F3690</string>
+								<string>29B97315FDCFA39411CA2CEA</string>
 								<string>29B97317FDCFA39411CA2CEA</string>
 								<string>1C37FBAC04509CD000000102</string>
 								<string>1C37FAAC04509CD000000102</string>
@@ -320,7 +364,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>17</integer>
+									<integer>20</integer>
 									<integer>15</integer>
 									<integer>5</integer>
 									<integer>4</integer>
@@ -329,7 +373,7 @@
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {246, 558}}</string>
+							<string>{{0, 6}, {246, 558}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -364,7 +408,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>TeamSettingsViewController.m</string>
+								<string>GeneralSettingsViewController.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -372,11 +416,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>TeamSettingsViewController.m</string>
+										<string>GeneralSettingsViewController.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>6157F7F7116F4233005E4A26</string>
+										<string>6188FFD7116FCEC1004F3690</string>
 										<key>history</key>
 										<array>
 											<string>6179889D114AA5BD00BA94A9</string>
@@ -431,7 +475,6 @@
 											<string>615F198E1166A71E002444F2</string>
 											<string>61CEDB60116ACBBB0067BAFC</string>
 											<string>611B0AC6116B6E8B00112153</string>
-											<string>611B0AC8116B6E8B00112153</string>
 											<string>611B0C42116BAF3A00112153</string>
 											<string>61056377116C0393003C420C</string>
 											<string>6105637A116C0393003C420C</string>
@@ -519,8 +562,6 @@
 											<string>619C52BF116E56330049FD84</string>
 											<string>619C52C1116E56330049FD84</string>
 											<string>619C5352116E72260049FD84</string>
-											<string>619C5354116E72260049FD84</string>
-											<string>619C5355116E72260049FD84</string>
 											<string>619C5373116E731F0049FD84</string>
 											<string>619C5858116E73B00049FD84</string>
 											<string>619C5859116E73B00049FD84</string>
@@ -560,11 +601,16 @@
 											<string>619C58B3116E76080049FD84</string>
 											<string>6196317D116E89DF00C47CEE</string>
 											<string>61F8E0D6116E98A900108149</string>
-											<string>6190E634116F2BE90092E8CE</string>
-											<string>619E8007116F39D8000BF85F</string>
 											<string>6157F7BA116F3B2D005E4A26</string>
 											<string>6157F7ED116F4043005E4A26</string>
-											<string>6157F7EE116F4043005E4A26</string>
+											<string>6188FE02116F5136004F3690</string>
+											<string>6188FE16116F6D44004F3690</string>
+											<string>6188FE17116F6D44004F3690</string>
+											<string>6188FE18116F6D44004F3690</string>
+											<string>6188FE60116F77AF004F3690</string>
+											<string>6188FE61116F77AF004F3690</string>
+											<string>6188FE8B116F8291004F3690</string>
+											<string>611B0AC8116B6E8B00112153</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -576,14 +622,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {533, 140}}</string>
+								<string>{{0, 0}, {533, 124}}</string>
 								<key>RubberWindowFrame</key>
 								<string>130 456 801 617 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>140pt</string>
+							<string>124pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -596,14 +642,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 145}, {533, 431}}</string>
+								<string>{{0, 129}, {533, 447}}</string>
 								<key>RubberWindowFrame</key>
 								<string>130 456 801 617 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>431pt</string>
+							<string>447pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -622,9 +668,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>6157F7A8116F3A24005E4A26</string>
+				<string>6188FE05116F5136004F3690</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>6157F7A9116F3A24005E4A26</string>
+				<string>6188FE06116F5136004F3690</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -762,14 +808,15 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>6157F7C5116F3BD7005E4A26</string>
-		<string>6157F7D0116F3BD7005E4A26</string>
-		<string>6157F7D1116F3BD7005E4A26</string>
-		<string>1C78EAAD065D492600B07095</string>
+		<string>6188FE96116F8291004F3690</string>
+		<string>6188FE07116F5136004F3690</string>
+		<string>6188FE08116F5136004F3690</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>61798848114AA42600BA94A9</string>
+		<string>6188FE1A116F6D44004F3690</string>
 		<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
-		<string>6157F7BD116F3B2D005E4A26</string>
+		<string>1C78EAAD065D492600B07095</string>
+		<string>6188FE8E116F8291004F3690</string>
 	</array>
 	<key>WindowString</key>
 	<string>130 456 801 617 0 0 1920 1178 </string>
@@ -788,12 +835,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string></string>
+								<string>HogNameViewController.m</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -849,7 +898,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>61798848114AA42600BA94A9</string>
-				<string>6157F7AD116F3A24005E4A26</string>
+				<string>6188FDF8116F5123004F3690</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -893,8 +942,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {412, 247}}</string>
-											<string>{{412, 0}, {411, 247}}</string>
+											<string>{{0, 0}, {412, 252}}</string>
+											<string>{{412, 0}, {411, 252}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -909,8 +958,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {823, 247}}</string>
-											<string>{{0, 247}, {823, 231}}</string>
+											<string>{{0, 0}, {823, 252}}</string>
+											<string>{{0, 252}, {823, 226}}</string>
 										</array>
 									</dict>
 								</dict>
@@ -940,12 +989,12 @@
 										<string>Value</string>
 										<real>85</real>
 										<string>Summary</string>
-										<real>95</real>
+										<real>94</real>
 										<string>Type</string>
 										<real>84</real>
 									</array>
 									<key>Frame</key>
-									<string>{{412, 0}, {411, 247}}</string>
+									<string>{{412, 0}, {411, 252}}</string>
 									<key>RubberWindowFrame</key>
 									<string>807 238 823 519 0 0 1920 1178 </string>
 								</dict>
@@ -973,13 +1022,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>6157F7C8116F3BD7005E4A26</string>
+				<string>6188FDF9116F5123004F3690</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>6157F7C9116F3BD7005E4A26</string>
-				<string>6157F7CA116F3BD7005E4A26</string>
-				<string>6157F7CB116F3BD7005E4A26</string>
-				<string>6157F7CC116F3BD7005E4A26</string>
-				<string>6157F7CD116F3BD7005E4A26</string>
+				<string>6188FDFA116F5123004F3690</string>
+				<string>6188FDFB116F5123004F3690</string>
+				<string>6188FDFC116F5123004F3690</string>
+				<string>6188FDFD116F5123004F3690</string>
+				<string>6188FDFE116F5123004F3690</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -1143,7 +1192,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>6157F7CE116F3BD7005E4A26</string>
+				<string>6188FDFF116F5123004F3690</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
@@ -1153,7 +1202,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>Identifier</key>
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Fri Apr 09 11:09:26 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Fri Apr 09 21:08:27 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 */,
@@ -107,229 +107,205 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 292502040;
-			PBXWorkspaceStateSaveDate = 292502040;
+			PBXPerProjectTemplateStateSaveDate = 292507723;
+			PBXWorkspaceStateSaveDate = 292507723;
 		};
 		perUserProjectItems = {
-			61056377116C0393003C420C = 61056377116C0393003C420C /* PBXBookmark */;
-			6105637A116C0393003C420C = 6105637A116C0393003C420C /* PBXTextBookmark */;
-			610563DE116C15E5003C420C = 610563DE116C15E5003C420C /* PBXTextBookmark */;
-			610563DF116C15E5003C420C = 610563DF116C15E5003C420C /* PBXTextBookmark */;
-			611B0AC6116B6E8B00112153 = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
-			611B0AC8116B6E8B00112153 = 611B0AC8116B6E8B00112153 /* PBXTextBookmark */;
-			611B0C42116BAF3A00112153 = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
-			611FD81F1155111700C2203D = 611FD81F1155111700C2203D /* PBXTextBookmark */;
-			611FD8201155111700C2203D = 611FD8201155111700C2203D /* PBXTextBookmark */;
-			611FD95811551C3700C2203D = 611FD95811551C3700C2203D /* 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 */;
-			61513435116C1B07001F16D1 = 61513435116C1B07001F16D1 /* PBXTextBookmark */;
-			61513436116C1B07001F16D1 = 61513436116C1B07001F16D1 /* PBXTextBookmark */;
-			6151348C116C2954001F16D1 = 6151348C116C2954001F16D1 /* PBXBookmark */;
-			6151348D116C2954001F16D1 = 6151348D116C2954001F16D1 /* PBXBookmark */;
-			6151348E116C2954001F16D1 = 6151348E116C2954001F16D1 /* PBXBookmark */;
-			6151348F116C2954001F16D1 = 6151348F116C2954001F16D1 /* PlistBookmark */;
-			6157F7A6116F3A1E005E4A26 /* PBXBookmark */ = 6157F7A6116F3A1E005E4A26 /* PBXBookmark */;
-			6157F7A7116F3A24005E4A26 /* PBXTextBookmark */ = 6157F7A7116F3A24005E4A26 /* PBXTextBookmark */;
-			6157F7AA116F3A24005E4A26 /* PBXTextBookmark */ = 6157F7AA116F3A24005E4A26 /* PBXTextBookmark */;
-			6157F7AB116F3A24005E4A26 /* PBXTextBookmark */ = 6157F7AB116F3A24005E4A26 /* PBXTextBookmark */;
-			6157F7AC116F3A24005E4A26 /* PBXTextBookmark */ = 6157F7AC116F3A24005E4A26 /* PBXTextBookmark */;
-			6157F7B7116F3B07005E4A26 /* PBXBookmark */ = 6157F7B7116F3B07005E4A26 /* PBXBookmark */;
+			61056377116C0393003C420C /* PBXBookmark */ = 61056377116C0393003C420C /* PBXBookmark */;
+			6105637A116C0393003C420C /* PBXTextBookmark */ = 6105637A116C0393003C420C /* PBXTextBookmark */;
+			610563DE116C15E5003C420C /* PBXTextBookmark */ = 610563DE116C15E5003C420C /* PBXTextBookmark */;
+			610563DF116C15E5003C420C /* PBXTextBookmark */ = 610563DF116C15E5003C420C /* PBXTextBookmark */;
+			611B0AC6116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC6116B6E8B00112153 /* PBXTextBookmark */;
+			611B0AC8116B6E8B00112153 /* PBXTextBookmark */ = 611B0AC8116B6E8B00112153 /* PBXTextBookmark */;
+			611B0C42116BAF3A00112153 /* PBXTextBookmark */ = 611B0C42116BAF3A00112153 /* PBXTextBookmark */;
+			611FD81F1155111700C2203D /* PBXTextBookmark */ = 611FD81F1155111700C2203D /* PBXTextBookmark */;
+			611FD8201155111700C2203D /* PBXTextBookmark */ = 611FD8201155111700C2203D /* PBXTextBookmark */;
+			611FD95811551C3700C2203D /* PBXBookmark */ = 611FD95811551C3700C2203D /* PBXBookmark */;
+			611FD96611551E8000C2203D /* PBXBookmark */ = 611FD96611551E8000C2203D /* PBXBookmark */;
+			611FDB6C1155C0B300C2203D /* PBXBookmark */ = 611FDB6C1155C0B300C2203D /* PBXBookmark */;
+			611FDB6D1155C0B300C2203D /* PBXBookmark */ = 611FDB6D1155C0B300C2203D /* PBXBookmark */;
+			611FDBF71155D39400C2203D /* PBXTextBookmark */ = 611FDBF71155D39400C2203D /* PBXTextBookmark */;
+			612D5C451165535400C6D842 /* PBXTextBookmark */ = 612D5C451165535400C6D842 /* PBXTextBookmark */;
+			612D616B1165536300C6D842 /* PBXTextBookmark */ = 612D616B1165536300C6D842 /* PBXTextBookmark */;
+			612D618F1165545F00C6D842 /* PBXTextBookmark */ = 612D618F1165545F00C6D842 /* PBXTextBookmark */;
+			61430D3B1165551600E2C62D /* PBXTextBookmark */ = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
+			61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
+			61513435116C1B07001F16D1 /* PBXTextBookmark */ = 61513435116C1B07001F16D1 /* PBXTextBookmark */;
+			61513436116C1B07001F16D1 /* PBXTextBookmark */ = 61513436116C1B07001F16D1 /* PBXTextBookmark */;
+			6151348C116C2954001F16D1 /* PBXBookmark */ = 6151348C116C2954001F16D1 /* PBXBookmark */;
+			6151348D116C2954001F16D1 /* PBXBookmark */ = 6151348D116C2954001F16D1 /* PBXBookmark */;
+			6151348E116C2954001F16D1 /* PBXBookmark */ = 6151348E116C2954001F16D1 /* PBXBookmark */;
+			6151348F116C2954001F16D1 /* PlistBookmark */ = 6151348F116C2954001F16D1 /* PlistBookmark */;
 			6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */ = 6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */;
-			6157F7BB116F3B2D005E4A26 /* PBXTextBookmark */ = 6157F7BB116F3B2D005E4A26 /* PBXTextBookmark */;
-			6157F7BC116F3B2D005E4A26 /* PBXTextBookmark */ = 6157F7BC116F3B2D005E4A26 /* PBXTextBookmark */;
-			6157F7BF116F3B2D005E4A26 /* PBXTextBookmark */ = 6157F7BF116F3B2D005E4A26 /* PBXTextBookmark */;
-			6157F7C0116F3B65005E4A26 /* PBXBookmark */ = 6157F7C0116F3B65005E4A26 /* PBXBookmark */;
-			6157F7C3116F3BD7005E4A26 /* PBXTextBookmark */ = 6157F7C3116F3BD7005E4A26 /* PBXTextBookmark */;
-			6157F7C4116F3BD7005E4A26 /* PBXTextBookmark */ = 6157F7C4116F3BD7005E4A26 /* PBXTextBookmark */;
-			6157F7C7116F3BD7005E4A26 /* PBXTextBookmark */ = 6157F7C7116F3BD7005E4A26 /* PBXTextBookmark */;
-			6157F7D8116F3D3F005E4A26 /* PBXTextBookmark */ = 6157F7D8116F3D3F005E4A26 /* PBXTextBookmark */;
-			6157F7D9116F3D3F005E4A26 /* PBXTextBookmark */ = 6157F7D9116F3D3F005E4A26 /* PBXTextBookmark */;
-			6157F7DA116F3D3F005E4A26 /* PBXTextBookmark */ = 6157F7DA116F3D3F005E4A26 /* PBXTextBookmark */;
-			6157F7DD116F3E19005E4A26 /* PBXBookmark */ = 6157F7DD116F3E19005E4A26 /* PBXBookmark */;
-			6157F7E0116F3EA2005E4A26 /* PBXTextBookmark */ = 6157F7E0116F3EA2005E4A26 /* PBXTextBookmark */;
-			6157F7E3116F3EA2005E4A26 /* PBXTextBookmark */ = 6157F7E3116F3EA2005E4A26 /* PBXTextBookmark */;
-			6157F7E4116F3EA2005E4A26 /* PBXTextBookmark */ = 6157F7E4116F3EA2005E4A26 /* PBXTextBookmark */;
 			6157F7ED116F4043005E4A26 /* PBXTextBookmark */ = 6157F7ED116F4043005E4A26 /* PBXTextBookmark */;
-			6157F7EE116F4043005E4A26 /* PBXTextBookmark */ = 6157F7EE116F4043005E4A26 /* PBXTextBookmark */;
-			6157F7EF116F4043005E4A26 /* PBXTextBookmark */ = 6157F7EF116F4043005E4A26 /* PBXTextBookmark */;
-			6157F7F0116F4043005E4A26 /* PBXTextBookmark */ = 6157F7F0116F4043005E4A26 /* PBXTextBookmark */;
-			6157F7F7116F4233005E4A26 /* PBXTextBookmark */ = 6157F7F7116F4233005E4A26 /* PBXTextBookmark */;
-			6157F7F8116F4233005E4A26 /* PBXTextBookmark */ = 6157F7F8116F4233005E4A26 /* PBXTextBookmark */;
-			615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */;
-			615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */;
-			615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
-			615F198C1166A71E002444F2 = 615F198C1166A71E002444F2 /* PBXBookmark */;
-			615F198E1166A71E002444F2 = 615F198E1166A71E002444F2 /* 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 */;
-			6190E634116F2BE90092E8CE = 6190E634116F2BE90092E8CE /* PBXTextBookmark */;
-			6196317D116E89DF00C47CEE = 6196317D116E89DF00C47CEE /* PBXTextBookmark */;
-			619C51C6116E42850049FD84 = 619C51C6116E42850049FD84 /* PBXTextBookmark */;
-			619C51C7116E42850049FD84 = 619C51C7116E42850049FD84 /* PBXTextBookmark */;
-			619C51CB116E42850049FD84 = 619C51CB116E42850049FD84 /* PBXTextBookmark */;
-			619C51E0116E45820049FD84 = 619C51E0116E45820049FD84 /* PBXTextBookmark */;
-			619C523C116E56330049FD84 = 619C523C116E56330049FD84 /* PBXTextBookmark */;
-			619C523D116E56330049FD84 = 619C523D116E56330049FD84 /* PBXBookmark */;
-			619C523F116E56330049FD84 = 619C523F116E56330049FD84 /* PBXBookmark */;
-			619C5241116E56330049FD84 = 619C5241116E56330049FD84 /* PBXBookmark */;
-			619C5243116E56330049FD84 = 619C5243116E56330049FD84 /* PBXBookmark */;
-			619C5245116E56330049FD84 = 619C5245116E56330049FD84 /* PBXBookmark */;
-			619C5247116E56330049FD84 = 619C5247116E56330049FD84 /* PBXBookmark */;
-			619C5249116E56330049FD84 = 619C5249116E56330049FD84 /* PBXBookmark */;
-			619C524B116E56330049FD84 = 619C524B116E56330049FD84 /* PBXBookmark */;
-			619C524D116E56330049FD84 = 619C524D116E56330049FD84 /* PBXBookmark */;
-			619C524F116E56330049FD84 = 619C524F116E56330049FD84 /* PBXBookmark */;
-			619C5251116E56330049FD84 = 619C5251116E56330049FD84 /* PBXBookmark */;
-			619C5253116E56330049FD84 = 619C5253116E56330049FD84 /* PBXBookmark */;
-			619C5255116E56330049FD84 = 619C5255116E56330049FD84 /* PBXBookmark */;
-			619C5257116E56330049FD84 = 619C5257116E56330049FD84 /* PBXBookmark */;
-			619C5259116E56330049FD84 = 619C5259116E56330049FD84 /* PBXBookmark */;
-			619C525B116E56330049FD84 = 619C525B116E56330049FD84 /* PBXBookmark */;
-			619C525D116E56330049FD84 = 619C525D116E56330049FD84 /* PBXBookmark */;
-			619C525F116E56330049FD84 = 619C525F116E56330049FD84 /* PBXBookmark */;
-			619C5261116E56330049FD84 = 619C5261116E56330049FD84 /* PBXBookmark */;
-			619C5263116E56330049FD84 = 619C5263116E56330049FD84 /* PBXBookmark */;
-			619C5265116E56330049FD84 = 619C5265116E56330049FD84 /* PBXBookmark */;
-			619C5267116E56330049FD84 = 619C5267116E56330049FD84 /* PBXBookmark */;
-			619C5269116E56330049FD84 = 619C5269116E56330049FD84 /* PBXBookmark */;
-			619C526B116E56330049FD84 = 619C526B116E56330049FD84 /* PBXBookmark */;
-			619C526D116E56330049FD84 = 619C526D116E56330049FD84 /* PBXBookmark */;
-			619C526F116E56330049FD84 = 619C526F116E56330049FD84 /* PBXBookmark */;
-			619C5271116E56330049FD84 = 619C5271116E56330049FD84 /* PBXBookmark */;
-			619C5273116E56330049FD84 = 619C5273116E56330049FD84 /* PBXBookmark */;
-			619C5275116E56330049FD84 = 619C5275116E56330049FD84 /* PBXBookmark */;
-			619C5277116E56330049FD84 = 619C5277116E56330049FD84 /* PBXBookmark */;
-			619C5279116E56330049FD84 = 619C5279116E56330049FD84 /* PBXBookmark */;
-			619C527B116E56330049FD84 = 619C527B116E56330049FD84 /* PBXBookmark */;
-			619C527D116E56330049FD84 = 619C527D116E56330049FD84 /* PBXBookmark */;
-			619C527F116E56330049FD84 = 619C527F116E56330049FD84 /* PBXBookmark */;
-			619C5281116E56330049FD84 = 619C5281116E56330049FD84 /* PBXBookmark */;
-			619C5283116E56330049FD84 = 619C5283116E56330049FD84 /* PBXBookmark */;
-			619C5285116E56330049FD84 = 619C5285116E56330049FD84 /* PBXBookmark */;
-			619C5287116E56330049FD84 = 619C5287116E56330049FD84 /* PBXBookmark */;
-			619C5289116E56330049FD84 = 619C5289116E56330049FD84 /* PBXBookmark */;
-			619C528B116E56330049FD84 = 619C528B116E56330049FD84 /* PBXBookmark */;
-			619C528D116E56330049FD84 = 619C528D116E56330049FD84 /* PBXBookmark */;
-			619C528F116E56330049FD84 = 619C528F116E56330049FD84 /* PBXBookmark */;
-			619C5291116E56330049FD84 = 619C5291116E56330049FD84 /* PBXBookmark */;
-			619C5293116E56330049FD84 = 619C5293116E56330049FD84 /* PBXBookmark */;
-			619C5295116E56330049FD84 = 619C5295116E56330049FD84 /* PBXBookmark */;
-			619C5297116E56330049FD84 = 619C5297116E56330049FD84 /* PBXBookmark */;
-			619C5299116E56330049FD84 = 619C5299116E56330049FD84 /* PBXBookmark */;
-			619C529B116E56330049FD84 = 619C529B116E56330049FD84 /* PBXBookmark */;
-			619C529D116E56330049FD84 = 619C529D116E56330049FD84 /* PBXBookmark */;
-			619C529F116E56330049FD84 = 619C529F116E56330049FD84 /* PBXBookmark */;
-			619C52A1116E56330049FD84 = 619C52A1116E56330049FD84 /* PBXBookmark */;
-			619C52A3116E56330049FD84 = 619C52A3116E56330049FD84 /* PBXBookmark */;
-			619C52A5116E56330049FD84 = 619C52A5116E56330049FD84 /* PBXBookmark */;
-			619C52A7116E56330049FD84 = 619C52A7116E56330049FD84 /* PBXBookmark */;
-			619C52A9116E56330049FD84 = 619C52A9116E56330049FD84 /* PBXBookmark */;
-			619C52AB116E56330049FD84 = 619C52AB116E56330049FD84 /* PBXBookmark */;
-			619C52AD116E56330049FD84 = 619C52AD116E56330049FD84 /* PBXBookmark */;
-			619C52AF116E56330049FD84 = 619C52AF116E56330049FD84 /* PBXBookmark */;
-			619C52B1116E56330049FD84 = 619C52B1116E56330049FD84 /* PBXBookmark */;
-			619C52B7116E56330049FD84 = 619C52B7116E56330049FD84 /* PBXBookmark */;
-			619C52B9116E56330049FD84 = 619C52B9116E56330049FD84 /* PBXBookmark */;
-			619C52BB116E56330049FD84 = 619C52BB116E56330049FD84 /* PBXBookmark */;
-			619C52BD116E56330049FD84 = 619C52BD116E56330049FD84 /* PBXBookmark */;
-			619C52BF116E56330049FD84 = 619C52BF116E56330049FD84 /* PBXBookmark */;
-			619C52C1116E56330049FD84 = 619C52C1116E56330049FD84 /* PBXBookmark */;
-			619C5352116E72260049FD84 = 619C5352116E72260049FD84 /* PBXTextBookmark */;
-			619C5354116E72260049FD84 = 619C5354116E72260049FD84 /* PBXTextBookmark */;
-			619C5355116E72260049FD84 = 619C5355116E72260049FD84 /* PBXTextBookmark */;
-			619C5373116E731F0049FD84 = 619C5373116E731F0049FD84 /* PBXTextBookmark */;
-			619C5858116E73B00049FD84 = 619C5858116E73B00049FD84 /* PBXTextBookmark */;
-			619C5859116E73B00049FD84 = 619C5859116E73B00049FD84 /* PBXBookmark */;
-			619C585B116E73B00049FD84 = 619C585B116E73B00049FD84 /* PBXBookmark */;
-			619C585D116E73B00049FD84 = 619C585D116E73B00049FD84 /* PBXBookmark */;
-			619C585F116E73B00049FD84 = 619C585F116E73B00049FD84 /* PBXBookmark */;
-			619C5861116E73B00049FD84 = 619C5861116E73B00049FD84 /* PBXBookmark */;
-			619C5863116E73B00049FD84 = 619C5863116E73B00049FD84 /* PBXBookmark */;
-			619C5865116E73B00049FD84 = 619C5865116E73B00049FD84 /* PBXBookmark */;
-			619C5867116E73B00049FD84 = 619C5867116E73B00049FD84 /* PBXBookmark */;
-			619C5869116E73B00049FD84 = 619C5869116E73B00049FD84 /* PBXBookmark */;
-			619C586B116E73B00049FD84 = 619C586B116E73B00049FD84 /* PBXBookmark */;
-			619C586D116E73B00049FD84 = 619C586D116E73B00049FD84 /* PBXBookmark */;
-			619C586F116E73B00049FD84 = 619C586F116E73B00049FD84 /* PBXBookmark */;
-			619C5871116E73B00049FD84 = 619C5871116E73B00049FD84 /* PBXBookmark */;
-			619C5873116E73B00049FD84 = 619C5873116E73B00049FD84 /* PBXBookmark */;
-			619C5875116E73B00049FD84 = 619C5875116E73B00049FD84 /* PBXBookmark */;
-			619C5877116E73B00049FD84 = 619C5877116E73B00049FD84 /* PBXBookmark */;
-			619C5879116E73B00049FD84 = 619C5879116E73B00049FD84 /* PBXBookmark */;
-			619C587B116E73B00049FD84 = 619C587B116E73B00049FD84 /* PBXBookmark */;
-			619C587D116E73B00049FD84 = 619C587D116E73B00049FD84 /* PBXBookmark */;
-			619C587F116E73B00049FD84 = 619C587F116E73B00049FD84 /* PBXBookmark */;
-			619C5880116E73B00049FD84 = 619C5880116E73B00049FD84 /* PBXBookmark */;
-			619C5882116E73B00049FD84 = 619C5882116E73B00049FD84 /* PBXBookmark */;
-			619C5883116E73B00049FD84 = 619C5883116E73B00049FD84 /* PBXBookmark */;
-			619C5885116E73B00049FD84 = 619C5885116E73B00049FD84 /* PBXBookmark */;
-			619C5887116E73B00049FD84 = 619C5887116E73B00049FD84 /* PBXBookmark */;
-			619C5888116E73B00049FD84 = 619C5888116E73B00049FD84 /* PBXBookmark */;
-			619C5889116E73B00049FD84 = 619C5889116E73B00049FD84 /* PBXBookmark */;
-			619C588B116E73B00049FD84 = 619C588B116E73B00049FD84 /* PBXBookmark */;
-			619C588C116E73B00049FD84 = 619C588C116E73B00049FD84 /* PBXBookmark */;
-			619C588D116E73B00049FD84 = 619C588D116E73B00049FD84 /* PBXBookmark */;
-			619C588F116E73B00049FD84 = 619C588F116E73B00049FD84 /* PBXBookmark */;
-			619C5890116E73B00049FD84 = 619C5890116E73B00049FD84 /* PBXBookmark */;
-			619C5892116E73B00049FD84 = 619C5892116E73B00049FD84 /* PBXBookmark */;
-			619C58B2116E76080049FD84 = 619C58B2116E76080049FD84 /* PBXBookmark */;
-			619C58B3116E76080049FD84 = 619C58B3116E76080049FD84 /* PBXTextBookmark */;
-			619E8006116F39D8000BF85F = 619E8006116F39D8000BF85F /* PBXTextBookmark */;
-			619E8007116F39D8000BF85F = 619E8007116F39D8000BF85F /* PBXTextBookmark */;
-			619E8008116F39D8000BF85F = 619E8008116F39D8000BF85F /* PBXTextBookmark */;
-			619E8009116F39D8000BF85F = 619E8009116F39D8000BF85F /* PBXTextBookmark */;
-			619E800D116F39D8000BF85F = 619E800D116F39D8000BF85F /* PBXTextBookmark */;
-			619E800E116F39D8000BF85F = 619E800E116F39D8000BF85F /* PBXTextBookmark */;
-			619E800F116F39D8000BF85F = 619E800F116F39D8000BF85F /* PBXTextBookmark */;
-			619E8011116F39D8000BF85F = 619E8011116F39D8000BF85F /* PBXTextBookmark */;
-			619E8012116F39D8000BF85F = 619E8012116F39D8000BF85F /* PBXTextBookmark */;
-			61CCBE60116135FF00833FE8 = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
-			61CCBF1E116162CA00833FE8 = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
-			61CCBF451161637F00833FE8 = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
-			61CCBF461161637F00833FE8 = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
-			61CCBF471161637F00833FE8 = 61CCBF471161637F00833FE8 /* 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 */;
-			61CCBFD91161833800833FE8 = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
-			61CCBFDA1161833800833FE8 = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
-			61CCBFDB1161833800833FE8 = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
-			61CCBFDC1161833800833FE8 = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
-			61CD270B116F2CCA00A138A5 = 61CD270B116F2CCA00A138A5 /* PBXTextBookmark */;
-			61CE23E7115E49560098C467 = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
-			61CE23FF115E4B290098C467 = 61CE23FF115E4B290098C467 /* PBXBookmark */;
-			61CE251F115E75A70098C467 = 61CE251F115E75A70098C467 /* PBXBookmark */;
-			61CEC5A6116C168E009FFF36 = 61CEC5A6116C168E009FFF36 /* PBXTextBookmark */;
-			61CEDB60116ACBBB0067BAFC = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
-			61E2F0811156B170002D33C1 = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
-			61F8E0D6116E98A900108149 = 61F8E0D6116E98A900108149 /* PBXTextBookmark */;
-			61FE29E7116CDB7300F76CDC = 61FE29E7116CDB7300F76CDC /* PBXTextBookmark */;
-			61FE2A89116CF05C00F76CDC = 61FE2A89116CF05C00F76CDC /* PBXTextBookmark */;
-			61FE2AE4116D658700F76CDC = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */;
-			61FE2B69116D78BF00F76CDC = 61FE2B69116D78BF00F76CDC /* PBXTextBookmark */;
+			615F1316116561BE002444F2 /* PBXTextBookmark */ = 615F1316116561BE002444F2 /* PBXTextBookmark */;
+			615F134D11656569002444F2 /* PBXTextBookmark */ = 615F134D11656569002444F2 /* PBXTextBookmark */;
+			615F147F11659AC5002444F2 /* PBXTextBookmark */ = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
+			615F198C1166A71E002444F2 /* PBXBookmark */ = 615F198C1166A71E002444F2 /* PBXBookmark */;
+			615F198E1166A71E002444F2 /* PBXTextBookmark */ = 615F198E1166A71E002444F2 /* 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 */;
+			6188FE02116F5136004F3690 /* PBXTextBookmark */ = 6188FE02116F5136004F3690 /* PBXTextBookmark */;
+			6188FE16116F6D44004F3690 /* PBXTextBookmark */ = 6188FE16116F6D44004F3690 /* PBXTextBookmark */;
+			6188FE17116F6D44004F3690 /* PBXTextBookmark */ = 6188FE17116F6D44004F3690 /* PBXTextBookmark */;
+			6188FE18116F6D44004F3690 /* PBXTextBookmark */ = 6188FE18116F6D44004F3690 /* PBXTextBookmark */;
+			6188FE60116F77AF004F3690 /* PBXTextBookmark */ = 6188FE60116F77AF004F3690 /* PBXTextBookmark */;
+			6188FE61116F77AF004F3690 /* PBXTextBookmark */ = 6188FE61116F77AF004F3690 /* PBXTextBookmark */;
+			6188FE8B116F8291004F3690 /* PBXTextBookmark */ = 6188FE8B116F8291004F3690 /* PBXTextBookmark */;
+			6188FE93116F8291004F3690 /* PBXTextBookmark */ = 6188FE93116F8291004F3690 /* PBXTextBookmark */;
+			6188FE94116F8291004F3690 /* PBXTextBookmark */ = 6188FE94116F8291004F3690 /* PBXTextBookmark */;
+			6188FFD3116FCE9F004F3690 /* PBXTextBookmark */ = 6188FFD3116FCE9F004F3690 /* PBXTextBookmark */;
+			6188FFD4116FCE9F004F3690 /* PBXTextBookmark */ = 6188FFD4116FCE9F004F3690 /* PBXTextBookmark */;
+			6188FFD7116FCEC1004F3690 /* PBXTextBookmark */ = 6188FFD7116FCEC1004F3690 /* PBXTextBookmark */;
+			6188FFD8116FCEC1004F3690 /* PBXTextBookmark */ = 6188FFD8116FCEC1004F3690 /* PBXTextBookmark */;
+			6188FFD9116FCEC1004F3690 /* PBXTextBookmark */ = 6188FFD9116FCEC1004F3690 /* PBXTextBookmark */;
+			618AFC07115BE92A003D411B /* PBXBookmark */ = 618AFC07115BE92A003D411B /* PBXBookmark */;
+			6196317D116E89DF00C47CEE /* PBXTextBookmark */ = 6196317D116E89DF00C47CEE /* PBXTextBookmark */;
+			619C51C6116E42850049FD84 /* PBXTextBookmark */ = 619C51C6116E42850049FD84 /* PBXTextBookmark */;
+			619C51C7116E42850049FD84 /* PBXTextBookmark */ = 619C51C7116E42850049FD84 /* PBXTextBookmark */;
+			619C51CB116E42850049FD84 /* PBXTextBookmark */ = 619C51CB116E42850049FD84 /* PBXTextBookmark */;
+			619C51E0116E45820049FD84 /* PBXTextBookmark */ = 619C51E0116E45820049FD84 /* PBXTextBookmark */;
+			619C523C116E56330049FD84 /* PBXTextBookmark */ = 619C523C116E56330049FD84 /* PBXTextBookmark */;
+			619C523D116E56330049FD84 /* PBXBookmark */ = 619C523D116E56330049FD84 /* PBXBookmark */;
+			619C523F116E56330049FD84 /* PBXBookmark */ = 619C523F116E56330049FD84 /* PBXBookmark */;
+			619C5241116E56330049FD84 /* PBXBookmark */ = 619C5241116E56330049FD84 /* PBXBookmark */;
+			619C5243116E56330049FD84 /* PBXBookmark */ = 619C5243116E56330049FD84 /* PBXBookmark */;
+			619C5245116E56330049FD84 /* PBXBookmark */ = 619C5245116E56330049FD84 /* PBXBookmark */;
+			619C5247116E56330049FD84 /* PBXBookmark */ = 619C5247116E56330049FD84 /* PBXBookmark */;
+			619C5249116E56330049FD84 /* PBXBookmark */ = 619C5249116E56330049FD84 /* PBXBookmark */;
+			619C524B116E56330049FD84 /* PBXBookmark */ = 619C524B116E56330049FD84 /* PBXBookmark */;
+			619C524D116E56330049FD84 /* PBXBookmark */ = 619C524D116E56330049FD84 /* PBXBookmark */;
+			619C524F116E56330049FD84 /* PBXBookmark */ = 619C524F116E56330049FD84 /* PBXBookmark */;
+			619C5251116E56330049FD84 /* PBXBookmark */ = 619C5251116E56330049FD84 /* PBXBookmark */;
+			619C5253116E56330049FD84 /* PBXBookmark */ = 619C5253116E56330049FD84 /* PBXBookmark */;
+			619C5255116E56330049FD84 /* PBXBookmark */ = 619C5255116E56330049FD84 /* PBXBookmark */;
+			619C5257116E56330049FD84 /* PBXBookmark */ = 619C5257116E56330049FD84 /* PBXBookmark */;
+			619C5259116E56330049FD84 /* PBXBookmark */ = 619C5259116E56330049FD84 /* PBXBookmark */;
+			619C525B116E56330049FD84 /* PBXBookmark */ = 619C525B116E56330049FD84 /* PBXBookmark */;
+			619C525D116E56330049FD84 /* PBXBookmark */ = 619C525D116E56330049FD84 /* PBXBookmark */;
+			619C525F116E56330049FD84 /* PBXBookmark */ = 619C525F116E56330049FD84 /* PBXBookmark */;
+			619C5261116E56330049FD84 /* PBXBookmark */ = 619C5261116E56330049FD84 /* PBXBookmark */;
+			619C5263116E56330049FD84 /* PBXBookmark */ = 619C5263116E56330049FD84 /* PBXBookmark */;
+			619C5265116E56330049FD84 /* PBXBookmark */ = 619C5265116E56330049FD84 /* PBXBookmark */;
+			619C5267116E56330049FD84 /* PBXBookmark */ = 619C5267116E56330049FD84 /* PBXBookmark */;
+			619C5269116E56330049FD84 /* PBXBookmark */ = 619C5269116E56330049FD84 /* PBXBookmark */;
+			619C526B116E56330049FD84 /* PBXBookmark */ = 619C526B116E56330049FD84 /* PBXBookmark */;
+			619C526D116E56330049FD84 /* PBXBookmark */ = 619C526D116E56330049FD84 /* PBXBookmark */;
+			619C526F116E56330049FD84 /* PBXBookmark */ = 619C526F116E56330049FD84 /* PBXBookmark */;
+			619C5271116E56330049FD84 /* PBXBookmark */ = 619C5271116E56330049FD84 /* PBXBookmark */;
+			619C5273116E56330049FD84 /* PBXBookmark */ = 619C5273116E56330049FD84 /* PBXBookmark */;
+			619C5275116E56330049FD84 /* PBXBookmark */ = 619C5275116E56330049FD84 /* PBXBookmark */;
+			619C5277116E56330049FD84 /* PBXBookmark */ = 619C5277116E56330049FD84 /* PBXBookmark */;
+			619C5279116E56330049FD84 /* PBXBookmark */ = 619C5279116E56330049FD84 /* PBXBookmark */;
+			619C527B116E56330049FD84 /* PBXBookmark */ = 619C527B116E56330049FD84 /* PBXBookmark */;
+			619C527D116E56330049FD84 /* PBXBookmark */ = 619C527D116E56330049FD84 /* PBXBookmark */;
+			619C527F116E56330049FD84 /* PBXBookmark */ = 619C527F116E56330049FD84 /* PBXBookmark */;
+			619C5281116E56330049FD84 /* PBXBookmark */ = 619C5281116E56330049FD84 /* PBXBookmark */;
+			619C5283116E56330049FD84 /* PBXBookmark */ = 619C5283116E56330049FD84 /* PBXBookmark */;
+			619C5285116E56330049FD84 /* PBXBookmark */ = 619C5285116E56330049FD84 /* PBXBookmark */;
+			619C5287116E56330049FD84 /* PBXBookmark */ = 619C5287116E56330049FD84 /* PBXBookmark */;
+			619C5289116E56330049FD84 /* PBXBookmark */ = 619C5289116E56330049FD84 /* PBXBookmark */;
+			619C528B116E56330049FD84 /* PBXBookmark */ = 619C528B116E56330049FD84 /* PBXBookmark */;
+			619C528D116E56330049FD84 /* PBXBookmark */ = 619C528D116E56330049FD84 /* PBXBookmark */;
+			619C528F116E56330049FD84 /* PBXBookmark */ = 619C528F116E56330049FD84 /* PBXBookmark */;
+			619C5291116E56330049FD84 /* PBXBookmark */ = 619C5291116E56330049FD84 /* PBXBookmark */;
+			619C5293116E56330049FD84 /* PBXBookmark */ = 619C5293116E56330049FD84 /* PBXBookmark */;
+			619C5295116E56330049FD84 /* PBXBookmark */ = 619C5295116E56330049FD84 /* PBXBookmark */;
+			619C5297116E56330049FD84 /* PBXBookmark */ = 619C5297116E56330049FD84 /* PBXBookmark */;
+			619C5299116E56330049FD84 /* PBXBookmark */ = 619C5299116E56330049FD84 /* PBXBookmark */;
+			619C529B116E56330049FD84 /* PBXBookmark */ = 619C529B116E56330049FD84 /* PBXBookmark */;
+			619C529D116E56330049FD84 /* PBXBookmark */ = 619C529D116E56330049FD84 /* PBXBookmark */;
+			619C529F116E56330049FD84 /* PBXBookmark */ = 619C529F116E56330049FD84 /* PBXBookmark */;
+			619C52A1116E56330049FD84 /* PBXBookmark */ = 619C52A1116E56330049FD84 /* PBXBookmark */;
+			619C52A3116E56330049FD84 /* PBXBookmark */ = 619C52A3116E56330049FD84 /* PBXBookmark */;
+			619C52A5116E56330049FD84 /* PBXBookmark */ = 619C52A5116E56330049FD84 /* PBXBookmark */;
+			619C52A7116E56330049FD84 /* PBXBookmark */ = 619C52A7116E56330049FD84 /* PBXBookmark */;
+			619C52A9116E56330049FD84 /* PBXBookmark */ = 619C52A9116E56330049FD84 /* PBXBookmark */;
+			619C52AB116E56330049FD84 /* PBXBookmark */ = 619C52AB116E56330049FD84 /* PBXBookmark */;
+			619C52AD116E56330049FD84 /* PBXBookmark */ = 619C52AD116E56330049FD84 /* PBXBookmark */;
+			619C52AF116E56330049FD84 /* PBXBookmark */ = 619C52AF116E56330049FD84 /* PBXBookmark */;
+			619C52B1116E56330049FD84 /* PBXBookmark */ = 619C52B1116E56330049FD84 /* PBXBookmark */;
+			619C52B7116E56330049FD84 /* PBXBookmark */ = 619C52B7116E56330049FD84 /* PBXBookmark */;
+			619C52B9116E56330049FD84 /* PBXBookmark */ = 619C52B9116E56330049FD84 /* PBXBookmark */;
+			619C52BB116E56330049FD84 /* PBXBookmark */ = 619C52BB116E56330049FD84 /* PBXBookmark */;
+			619C52BD116E56330049FD84 /* PBXBookmark */ = 619C52BD116E56330049FD84 /* PBXBookmark */;
+			619C52BF116E56330049FD84 /* PBXBookmark */ = 619C52BF116E56330049FD84 /* PBXBookmark */;
+			619C52C1116E56330049FD84 /* PBXBookmark */ = 619C52C1116E56330049FD84 /* PBXBookmark */;
+			619C5352116E72260049FD84 /* PBXTextBookmark */ = 619C5352116E72260049FD84 /* PBXTextBookmark */;
+			619C5373116E731F0049FD84 /* PBXTextBookmark */ = 619C5373116E731F0049FD84 /* PBXTextBookmark */;
+			619C5858116E73B00049FD84 /* PBXTextBookmark */ = 619C5858116E73B00049FD84 /* PBXTextBookmark */;
+			619C5859116E73B00049FD84 /* PBXBookmark */ = 619C5859116E73B00049FD84 /* PBXBookmark */;
+			619C585B116E73B00049FD84 /* PBXBookmark */ = 619C585B116E73B00049FD84 /* PBXBookmark */;
+			619C585D116E73B00049FD84 /* PBXBookmark */ = 619C585D116E73B00049FD84 /* PBXBookmark */;
+			619C585F116E73B00049FD84 /* PBXBookmark */ = 619C585F116E73B00049FD84 /* PBXBookmark */;
+			619C5861116E73B00049FD84 /* PBXBookmark */ = 619C5861116E73B00049FD84 /* PBXBookmark */;
+			619C5863116E73B00049FD84 /* PBXBookmark */ = 619C5863116E73B00049FD84 /* PBXBookmark */;
+			619C5865116E73B00049FD84 /* PBXBookmark */ = 619C5865116E73B00049FD84 /* PBXBookmark */;
+			619C5867116E73B00049FD84 /* PBXBookmark */ = 619C5867116E73B00049FD84 /* PBXBookmark */;
+			619C5869116E73B00049FD84 /* PBXBookmark */ = 619C5869116E73B00049FD84 /* PBXBookmark */;
+			619C586B116E73B00049FD84 /* PBXBookmark */ = 619C586B116E73B00049FD84 /* PBXBookmark */;
+			619C586D116E73B00049FD84 /* PBXBookmark */ = 619C586D116E73B00049FD84 /* PBXBookmark */;
+			619C586F116E73B00049FD84 /* PBXBookmark */ = 619C586F116E73B00049FD84 /* PBXBookmark */;
+			619C5871116E73B00049FD84 /* PBXBookmark */ = 619C5871116E73B00049FD84 /* PBXBookmark */;
+			619C5873116E73B00049FD84 /* PBXBookmark */ = 619C5873116E73B00049FD84 /* PBXBookmark */;
+			619C5875116E73B00049FD84 /* PBXBookmark */ = 619C5875116E73B00049FD84 /* PBXBookmark */;
+			619C5877116E73B00049FD84 /* PBXBookmark */ = 619C5877116E73B00049FD84 /* PBXBookmark */;
+			619C5879116E73B00049FD84 /* PBXBookmark */ = 619C5879116E73B00049FD84 /* PBXBookmark */;
+			619C587B116E73B00049FD84 /* PBXBookmark */ = 619C587B116E73B00049FD84 /* PBXBookmark */;
+			619C587D116E73B00049FD84 /* PBXBookmark */ = 619C587D116E73B00049FD84 /* PBXBookmark */;
+			619C587F116E73B00049FD84 /* PBXBookmark */ = 619C587F116E73B00049FD84 /* PBXBookmark */;
+			619C5880116E73B00049FD84 /* PBXBookmark */ = 619C5880116E73B00049FD84 /* PBXBookmark */;
+			619C5882116E73B00049FD84 /* PBXBookmark */ = 619C5882116E73B00049FD84 /* PBXBookmark */;
+			619C5883116E73B00049FD84 /* PBXBookmark */ = 619C5883116E73B00049FD84 /* PBXBookmark */;
+			619C5885116E73B00049FD84 /* PBXBookmark */ = 619C5885116E73B00049FD84 /* PBXBookmark */;
+			619C5887116E73B00049FD84 /* PBXBookmark */ = 619C5887116E73B00049FD84 /* PBXBookmark */;
+			619C5888116E73B00049FD84 /* PBXBookmark */ = 619C5888116E73B00049FD84 /* PBXBookmark */;
+			619C5889116E73B00049FD84 /* PBXBookmark */ = 619C5889116E73B00049FD84 /* PBXBookmark */;
+			619C588B116E73B00049FD84 /* PBXBookmark */ = 619C588B116E73B00049FD84 /* PBXBookmark */;
+			619C588C116E73B00049FD84 /* PBXBookmark */ = 619C588C116E73B00049FD84 /* PBXBookmark */;
+			619C588D116E73B00049FD84 /* PBXBookmark */ = 619C588D116E73B00049FD84 /* PBXBookmark */;
+			619C588F116E73B00049FD84 /* PBXBookmark */ = 619C588F116E73B00049FD84 /* PBXBookmark */;
+			619C5890116E73B00049FD84 /* PBXBookmark */ = 619C5890116E73B00049FD84 /* PBXBookmark */;
+			619C5892116E73B00049FD84 /* PBXBookmark */ = 619C5892116E73B00049FD84 /* PBXBookmark */;
+			619C58B2116E76080049FD84 /* PBXBookmark */ = 619C58B2116E76080049FD84 /* PBXBookmark */;
+			619C58B3116E76080049FD84 /* PBXTextBookmark */ = 619C58B3116E76080049FD84 /* PBXTextBookmark */;
+			61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = 61CCBE60116135FF00833FE8 /* PBXTextBookmark */;
+			61CCBF1E116162CA00833FE8 /* PBXTextBookmark */ = 61CCBF1E116162CA00833FE8 /* PBXTextBookmark */;
+			61CCBF451161637F00833FE8 /* PBXTextBookmark */ = 61CCBF451161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF461161637F00833FE8 /* PBXTextBookmark */ = 61CCBF461161637F00833FE8 /* PBXTextBookmark */;
+			61CCBF471161637F00833FE8 /* PBXTextBookmark */ = 61CCBF471161637F00833FE8 /* 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 */;
+			61CCBFD91161833800833FE8 /* PBXTextBookmark */ = 61CCBFD91161833800833FE8 /* PBXTextBookmark */;
+			61CCBFDA1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDA1161833800833FE8 /* PBXTextBookmark */;
+			61CCBFDB1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDB1161833800833FE8 /* PBXTextBookmark */;
+			61CCBFDC1161833800833FE8 /* PBXTextBookmark */ = 61CCBFDC1161833800833FE8 /* PBXTextBookmark */;
+			61CE23E7115E49560098C467 /* PBXTextBookmark */ = 61CE23E7115E49560098C467 /* PBXTextBookmark */;
+			61CE23FF115E4B290098C467 /* PBXBookmark */ = 61CE23FF115E4B290098C467 /* PBXBookmark */;
+			61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */;
+			61CEC5A6116C168E009FFF36 /* PBXTextBookmark */ = 61CEC5A6116C168E009FFF36 /* PBXTextBookmark */;
+			61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
+			61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
+			61F8E0D6116E98A900108149 /* PBXTextBookmark */ = 61F8E0D6116E98A900108149 /* PBXTextBookmark */;
+			61FE29E7116CDB7300F76CDC /* PBXTextBookmark */ = 61FE29E7116CDB7300F76CDC /* PBXTextBookmark */;
+			61FE2A89116CF05C00F76CDC /* PBXTextBookmark */ = 61FE2A89116CF05C00F76CDC /* PBXTextBookmark */;
+			61FE2AE4116D658700F76CDC /* PBXTextBookmark */ = 61FE2AE4116D658700F76CDC /* PBXTextBookmark */;
+			61FE2B69116D78BF00F76CDC /* PBXTextBookmark */ = 61FE2B69116D78BF00F76CDC /* PBXTextBookmark */;
 		};
 		sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
 		userBuildSettings = {
@@ -385,17 +361,17 @@
 	};
 	611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
-			sepNavSelRange = "{666, 0}";
-			sepNavVisRange = "{0, 809}";
+			sepNavIntBoundsRect = "{{0, 0}, {642, 455}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 148}";
 		};
 	};
 	611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 4485}}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 4368}}";
 			sepNavSelRange = "{773, 0}";
-			sepNavVisRange = "{1534, 1733}";
-			sepNavWindowFrame = "{{791, 245}, {1058, 792}}";
+			sepNavVisRange = "{6031, 2352}";
+			sepNavWindowFrame = "{{225, 314}, {1058, 792}}";
 		};
 	};
 	611B0AC6116B6E8B00112153 /* PBXTextBookmark */ = {
@@ -567,251 +543,40 @@
 		rLen = 0;
 		rLoc = 9223372036854775808;
 	};
-	6157F7A6116F3A1E005E4A26 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 619C533C116E70050049FD84 /* FortsViewController.h */;
-	};
-	6157F7A7116F3A24005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
-		name = "SingleTeamViewController.h: 19";
-		rLen = 0;
-		rLoc = 434;
-		rType = 0;
-		vrLen = 213;
-		vrLoc = 337;
-	};
-	6157F7AA116F3A24005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 40";
-		rLen = 0;
-		rLoc = 1506;
-		rType = 0;
-		vrLen = 1843;
-		vrLoc = 0;
-	};
-	6157F7AB116F3A24005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 59";
-		rLen = 1;
-		rLoc = 2108;
-		rType = 0;
-		vrLen = 2341;
-		vrLoc = 1123;
-	};
-	6157F7AC116F3A24005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 619C533C116E70050049FD84 /* FortsViewController.h */;
-		name = "FortsViewController.h: 12";
-		rLen = 0;
-		rLoc = 209;
-		rType = 0;
-		vrLen = 582;
-		vrLoc = 0;
-	};
-	6157F7B7116F3B07005E4A26 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-	};
 	6157F7BA116F3B2D005E4A26 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
 		name = "SingleTeamViewController.h: 19";
 		rLen = 0;
-		rLoc = 434;
+		rLoc = 527;
 		rType = 0;
 		vrLen = 213;
 		vrLoc = 337;
 	};
-	6157F7BB116F3B2D005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 59";
-		rLen = 1;
-		rLoc = 2108;
-		rType = 0;
-		vrLen = 414;
-		vrLoc = 2233;
-	};
-	6157F7BC116F3B2D005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 59";
-		rLen = 1;
-		rLoc = 2108;
-		rType = 0;
-		vrLen = 335;
-		vrLoc = 2233;
-	};
-	6157F7BF116F3B2D005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 74";
-		rLen = 0;
-		rLoc = 2630;
-		rType = 0;
-		vrLen = 1941;
-		vrLoc = 1884;
-	};
-	6157F7C0116F3B65005E4A26 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 619C5231116E4E810049FD84 /* FlagsViewController.m */;
-	};
-	6157F7C3116F3BD7005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 59";
-		rLen = 1;
-		rLoc = 2108;
-		rType = 0;
-		vrLen = 324;
-		vrLoc = 2233;
-	};
-	6157F7C4116F3BD7005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 110";
-		rLen = 0;
-		rLoc = 3918;
-		rType = 0;
-		vrLen = 1750;
-		vrLoc = 2756;
-	};
-	6157F7C7116F3BD7005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 619C5231116E4E810049FD84 /* FlagsViewController.m */;
-		name = "FlagsViewController.m: 50";
-		rLen = 0;
-		rLoc = 1527;
-		rType = 0;
-		vrLen = 1575;
-		vrLoc = 4221;
-	};
-	6157F7D8116F3D3F005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 57";
-		rLen = 1;
-		rLoc = 2108;
-		rType = 0;
-		vrLen = 273;
-		vrLoc = 2267;
-	};
-	6157F7D9116F3D3F005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 243";
-		rLen = 0;
-		rLoc = 8435;
-		rType = 0;
-		vrLen = 1692;
-		vrLoc = 7690;
-	};
-	6157F7DA116F3D3F005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 619C5231116E4E810049FD84 /* FlagsViewController.m */;
-		name = "FlagsViewController.m: 50";
-		rLen = 0;
-		rLoc = 1527;
-		rType = 0;
-		vrLen = 1693;
-		vrLoc = 1667;
-	};
-	6157F7DD116F3E19005E4A26 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-	};
-	6157F7E0116F3EA2005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 57";
-		rLen = 1;
-		rLoc = 2108;
-		rType = 0;
-		vrLen = 273;
-		vrLoc = 2267;
-	};
-	6157F7E3116F3EA2005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 170";
-		rLen = 0;
-		rLoc = 5894;
-		rType = 0;
-		vrLen = 1953;
-		vrLoc = 4588;
-	};
-	6157F7E4116F3EA2005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 118";
-		rLen = 0;
-		rLoc = 4185;
-		rType = 0;
-		vrLen = 1819;
-		vrLoc = 4426;
-	};
 	6157F7ED116F4043005E4A26 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 57";
 		rLen = 1;
-		rLoc = 2108;
+		rLoc = 5023;
 		rType = 0;
 		vrLen = 273;
 		vrLoc = 2267;
 	};
-	6157F7EE116F4043005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */;
-		name = "TeamSettingsViewController.m: 42";
-		rLen = 0;
-		rLoc = 1602;
-		rType = 0;
-		vrLen = 248;
-		vrLoc = 1557;
-	};
-	6157F7EF116F4043005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */;
-		name = "TeamSettingsViewController.m: 42";
-		rLen = 0;
-		rLoc = 1602;
-		rType = 0;
-		vrLen = 248;
-		vrLoc = 1557;
-	};
-	6157F7F0116F4043005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 247";
-		rLen = 0;
-		rLoc = 9056;
-		rType = 0;
-		vrLen = 1826;
-		vrLoc = 7749;
-	};
-	6157F7F7116F4233005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */;
-		name = "TeamSettingsViewController.m: 42";
-		rLen = 0;
-		rLoc = 1602;
-		rType = 0;
-		vrLen = 274;
-		vrLoc = 1557;
-	};
-	6157F7F8116F4233005E4A26 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 227";
-		rLen = 0;
-		rLoc = 8054;
-		rType = 0;
-		vrLen = 1897;
-		vrLoc = 7749;
+	6157F7FA116F466F005E4A26 /* HogNameViewController.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {943, 650}}";
+			sepNavSelRange = "{454, 53}";
+			sepNavVisRange = "{0, 513}";
+			sepNavWindowFrame = "{{677, 126}, {750, 558}}";
+		};
+	};
+	6157F7FB116F466F005E4A26 /* HogNameViewController.m */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {943, 1755}}";
+			sepNavSelRange = "{3303, 442}";
+			sepNavVisRange = "{0, 1999}";
+		};
 	};
 	615F1316116561BE002444F2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -1409,20 +1174,150 @@
 		isa = PBXBookmark;
 		fRef = 6179936711501D3D00BA94A9 /* arrowDown.png */;
 	};
+	6188FE02116F5136004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
+		name = "HogHatViewController.m: 112";
+		rLen = 0;
+		rLoc = 3692;
+		rType = 0;
+		vrLen = 185;
+		vrLoc = 149;
+	};
+	6188FE16116F6D44004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6157F7FB116F466F005E4A26 /* HogNameViewController.m */;
+		name = "HogNameViewController.m: 77";
+		rLen = 0;
+		rLoc = 2664;
+		rType = 0;
+		vrLen = 264;
+		vrLoc = 1557;
+	};
+	6188FE17116F6D44004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11AE21168DC9400359010 /* HogHatViewController.h */;
+		name = "HogHatViewController.h: 24";
+		rLen = 0;
+		rLoc = 547;
+		rType = 0;
+		vrLen = 267;
+		vrLoc = 385;
+	};
+	6188FE18116F6D44004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 619C533C116E70050049FD84 /* FortsViewController.h */;
+		name = "FortsViewController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 143;
+		vrLoc = 151;
+	};
+	6188FE60116F77AF004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */;
+		name = "TeamSettingsViewController.m: 42";
+		rLen = 0;
+		rLoc = 1602;
+		rType = 0;
+		vrLen = 253;
+		vrLoc = 1557;
+	};
+	6188FE61116F77AF004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 619C5230116E4E800049FD84 /* FlagsViewController.h */;
+		name = "FlagsViewController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 152;
+		vrLoc = 0;
+	};
+	6188FE8B116F8291004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6157F7FA116F466F005E4A26 /* HogNameViewController.h */;
+		name = "HogNameViewController.h: 12";
+		rLen = 0;
+		rLoc = 237;
+		rType = 0;
+		vrLen = 159;
+		vrLoc = 153;
+	};
+	6188FE93116F8291004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6157F7FA116F466F005E4A26 /* HogNameViewController.h */;
+		name = "HogNameViewController.h: 21";
+		rLen = 53;
+		rLoc = 454;
+		rType = 0;
+		vrLen = 513;
+		vrLoc = 0;
+	};
+	6188FE94116F8291004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6157F7FB116F466F005E4A26 /* HogNameViewController.m */;
+		name = "HogNameViewController.m: 20";
+		rLen = 0;
+		rLoc = 454;
+		rType = 0;
+		vrLen = 2130;
+		vrLoc = 154;
+	};
+	6188FFD3116FCE9F004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
+		name = "SingleTeamViewController.h: 23";
+		rLen = 18;
+		rLoc = 554;
+		rType = 0;
+		vrLen = 874;
+		vrLoc = 0;
+	};
+	6188FFD4116FCE9F004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 331";
+		rLen = 0;
+		rLoc = 13201;
+		rType = 0;
+		vrLen = 1890;
+		vrLoc = 11371;
+	};
+	6188FFD7116FCEC1004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
+		name = "GeneralSettingsViewController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 148;
+		vrLoc = 0;
+	};
+	6188FFD8116FCEC1004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
+		name = "SingleTeamViewController.m: 323";
+		rLen = 0;
+		rLoc = 13025;
+		rType = 0;
+		vrLen = 2040;
+		vrLoc = 7024;
+	};
+	6188FFD9116FCEC1004F3690 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6157F7FB116F466F005E4A26 /* HogNameViewController.m */;
+		name = "HogNameViewController.m: 99";
+		rLen = 442;
+		rLoc = 3303;
+		rType = 0;
+		vrLen = 1999;
+		vrLoc = 0;
+	};
 	618AFC07115BE92A003D411B /* PBXBookmark */ = {
 		isa = PBXBookmark;
 		fRef = 61798A20114ADD2600BA94A9 /* backgroundLeft.png */;
 	};
-	6190E634116F2BE90092E8CE /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 117";
-		rLen = 0;
-		rLoc = 3692;
-		rType = 0;
-		vrLen = 331;
-		vrLoc = 3;
-	};
 	6196317D116E89DF00C47CEE /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 32CA4F630368D1EE00C91783 /* HedgewarsMobile_Prefix.pch */;
@@ -1443,10 +1338,10 @@
 	};
 	619C51BE116E40FC0049FD84 /* CommodityFunctions.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 641}}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
 			sepNavSelRange = "{183, 0}";
 			sepNavVisRange = "{0, 1695}";
-			sepNavWindowFrame = "{{556, 105}, {1058, 792}}";
+			sepNavWindowFrame = "{{556, 119}, {1058, 792}}";
 		};
 	};
 	619C51C6116E42850049FD84 /* PBXTextBookmark */ = {
@@ -1491,17 +1386,17 @@
 	};
 	619C5230116E4E800049FD84 /* FlagsViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
+			sepNavIntBoundsRect = "{{0, 0}, {472, 338}}";
 			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 582}";
+			sepNavVisRange = "{0, 152}";
 			sepNavWindowFrame = "{{86, 212}, {1058, 792}}";
 		};
 	};
 	619C5231116E4E810049FD84 /* FlagsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 2431}}";
-			sepNavSelRange = "{1527, 0}";
-			sepNavVisRange = "{1667, 1759}";
+			sepNavIntBoundsRect = "{{0, 0}, {1048, 2405}}";
+			sepNavSelRange = "{321, 170}";
+			sepNavVisRange = "{0, 1534}";
 			sepNavWindowFrame = "{{67, 264}, {1058, 792}}";
 		};
 	};
@@ -2295,17 +2190,17 @@
 	};
 	619C533C116E70050049FD84 /* FortsViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
-			sepNavSelRange = "{209, 0}";
-			sepNavVisRange = "{0, 582}";
+			sepNavIntBoundsRect = "{{0, 0}, {472, 338}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{151, 143}";
 			sepNavWindowFrame = "{{628, 243}, {1058, 792}}";
 		};
 	};
 	619C533D116E70050049FD84 /* FortsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 2652}}";
+			sepNavIntBoundsRect = "{{0, 0}, {929, 2808}}";
 			sepNavSelRange = "{5012, 1}";
-			sepNavVisRange = "{4835, 430}";
+			sepNavVisRange = "{4835, 228}";
 			sepNavWindowFrame = "{{84, 361}, {1058, 792}}";
 		};
 	};
@@ -2319,26 +2214,6 @@
 		vrLen = 747;
 		vrLoc = 0;
 	};
-	619C5354116E72260049FD84 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 619C5230116E4E800049FD84 /* FlagsViewController.h */;
-		name = "FlagsViewController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 325;
-		vrLoc = 0;
-	};
-	619C5355116E72260049FD84 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 619C533C116E70050049FD84 /* FortsViewController.h */;
-		name = "FortsViewController.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 325;
-		vrLoc = 0;
-	};
 	619C5373116E731F0049FD84 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 619C5231116E4E810049FD84 /* FlagsViewController.m */;
@@ -2696,96 +2571,6 @@
 		vrLen = 222;
 		vrLoc = 0;
 	};
-	619E8006116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
-		name = "SingleTeamViewController.m: 59";
-		rLen = 1;
-		rLoc = 2108;
-		rType = 0;
-		vrLen = 460;
-		vrLoc = 2233;
-	};
-	619E8007116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE21168DC9400359010 /* HogHatViewController.h */;
-		name = "HogHatViewController.h: 24";
-		rLen = 0;
-		rLoc = 547;
-		rType = 0;
-		vrLen = 301;
-		vrLoc = 351;
-	};
-	619E8008116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
-		name = "SingleTeamViewController.h: 19";
-		rLen = 0;
-		rLoc = 434;
-		rType = 0;
-		vrLen = 261;
-		vrLoc = 337;
-	};
-	619E8009116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
-		name = "SingleTeamViewController.h: 19";
-		rLen = 0;
-		rLoc = 434;
-		rType = 0;
-		vrLen = 261;
-		vrLoc = 337;
-	};
-	619E800D116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */;
-		name = "SingleTeamViewController.h: 26";
-		rLen = 0;
-		rLoc = 711;
-		rType = 0;
-		vrLen = 683;
-		vrLoc = 34;
-	};
-	619E800E116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 40";
-		rLen = 0;
-		rLoc = 1506;
-		rType = 0;
-		vrLen = 599;
-		vrLoc = 0;
-	};
-	619E800F116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 40";
-		rLen = 0;
-		rLoc = 1506;
-		rType = 0;
-		vrLen = 599;
-		vrLoc = 0;
-	};
-	619E8011116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 40";
-		rLen = 0;
-		rLoc = 1506;
-		rType = 0;
-		vrLen = 599;
-		vrLoc = 0;
-	};
-	619E8012116F39D8000BF85F /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
-		name = "HogHatViewController.m: 8";
-		rLen = 1;
-		rLoc = 152;
-		rType = 0;
-		vrLen = 599;
-		vrLoc = 0;
-	};
 	61A11A4C1168D13600359010 /* PopoverMenuViewController.h */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
@@ -2842,10 +2627,10 @@
 	};
 	61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {810, 2522}}";
+			sepNavIntBoundsRect = "{{0, 0}, {810, 2548}}";
 			sepNavSelRange = "{1602, 0}";
-			sepNavVisRange = "{1557, 274}";
-			sepNavWindowFrame = "{{170, 237}, {1058, 792}}";
+			sepNavVisRange = "{1557, 253}";
+			sepNavWindowFrame = "{{529, 227}, {1058, 792}}";
 		};
 	};
 	61A11AD41168DB3700359010 /* DetailViewController.h */ = {
@@ -2866,33 +2651,34 @@
 	};
 	61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {472, 377}}";
-			sepNavSelRange = "{434, 0}";
-			sepNavVisRange = "{337, 213}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
+			sepNavSelRange = "{554, 18}";
+			sepNavVisRange = "{0, 874}";
+			sepNavWindowFrame = "{{38, 374}, {1002, 778}}";
 		};
 	};
 	61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 3692}}";
-			sepNavSelRange = "{8054, 0}";
-			sepNavVisRange = "{7749, 1897}";
-			sepNavWindowFrame = "{{589, 145}, {1058, 792}}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 4537}}";
+			sepNavSelRange = "{13025, 0}";
+			sepNavVisRange = "{7024, 2040}";
+			sepNavWindowFrame = "{{688, 119}, {1058, 792}}";
 		};
 	};
 	61A11AE21168DC9400359010 /* HogHatViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {472, 364}}";
-			sepNavSelRange = "{547, 0}";
-			sepNavVisRange = "{351, 301}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
+			sepNavSelRange = "{446, 45}";
+			sepNavVisRange = "{0, 652}";
 			sepNavWindowFrame = "{{49, 251}, {1058, 792}}";
 		};
 	};
 	61A11AE31168DC9400359010 /* HogHatViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 2678}}";
-			sepNavSelRange = "{6165, 0}";
-			sepNavVisRange = "{4588, 1953}";
-			sepNavWindowFrame = "{{49, 251}, {1058, 792}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1048, 2717}}";
+			sepNavSelRange = "{507, 0}";
+			sepNavVisRange = "{0, 1843}";
+			sepNavWindowFrame = "{{421, 119}, {1058, 792}}";
 		};
 	};
 	61CCBE60116135FF00833FE8 /* PBXTextBookmark */ = {
@@ -3085,16 +2871,6 @@
 		vrLen = 148;
 		vrLoc = 22940;
 	};
-	61CD270B116F2CCA00A138A5 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */;
-		name = "TeamSettingsViewController.m: 42";
-		rLen = 0;
-		rLoc = 1602;
-		rType = 0;
-		vrLen = 564;
-		vrLoc = 1557;
-	};
 	61CE23E7115E49560098C467 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 6179880F114AA34C00BA94A9 /* uWorld.pas */;