restore and update the old general settings
authorkoda
Tue, 06 Apr 2010 18:14:15 +0000
changeset 3312 6d8f1c76756d
parent 3311 18436bb84bfe
child 3313 fbf59d08a395
restore and update the old general settings show hats in the team table
cocoaTouch/DetailViewController.m
cocoaTouch/GameSetup.m
cocoaTouch/GeneralSettingsViewController.h
cocoaTouch/GeneralSettingsViewController.m
cocoaTouch/HogHatViewController.m
cocoaTouch/MainMenuViewController.h
cocoaTouch/MainMenuViewController.m
cocoaTouch/MasterViewController.h
cocoaTouch/MasterViewController.m
cocoaTouch/SettingsViewController.h
cocoaTouch/SettingsViewController.m
cocoaTouch/SingleTeamViewController.h
cocoaTouch/SingleTeamViewController.m
cocoaTouch/SplitViewRootController.m
hedgewars/hwengine.pas
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3
project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser
--- a/cocoaTouch/DetailViewController.m	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/DetailViewController.m	Tue Apr 06 18:14:15 2010 +0000
@@ -7,8 +7,9 @@
 //
 
 #import "DetailViewController.h"
+#import "SDL_uikitappdelegate.h"
 #import "TeamSettingsViewController.h"
-#import "SDL_uikitappdelegate.h"
+#import "GeneralSettingsViewController.h"
 
 @implementation DetailViewController
 @synthesize popoverController, controllers;
@@ -22,10 +23,15 @@
 
     NSMutableArray *array= [[NSMutableArray alloc] init];
 
+    GeneralSettingsViewController *generalSettingsViewController = [[GeneralSettingsViewController alloc]
+                                                                    initWithStyle:UITableViewStyleGrouped];
+    generalSettingsViewController.title = NSLocalizedString(@"General",@"");
+    [array addObject:generalSettingsViewController];
+    [generalSettingsViewController release];
+    
     TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] 
                                                               initWithStyle:UITableViewStyleGrouped];
     teamSettingsViewController.title = NSLocalizedString(@"Teams",@"");
-
     [array addObject:teamSettingsViewController];
     [teamSettingsViewController release];
     
--- a/cocoaTouch/GameSetup.m	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/GameSetup.m	Tue Apr 06 18:14:15 2010 +0000
@@ -325,7 +325,16 @@
     [machine release];
     */
     
-	gameArgs[0] = [[systemSettings objectForKey:@"username"] UTF8String];	//UserNick
+    // prevents using an empty nickname
+    NSString *username;
+    NSString *originalUsername = [systemSettings objectForKey:@"username"];
+    if ([originalUsername isEqualToString:@""]) {
+        username = [[NSString alloc] initWithFormat:@"MobileUser-%@",ipcString];
+    } else {
+        username = [[NSString alloc] initWithString:originalUsername];
+    }
+    
+	gameArgs[0] = [username UTF8String];                                    //UserNick
 	gameArgs[1] = [ipcString UTF8String];                                   //ipcPort
 	gameArgs[2] = [[systemSettings objectForKey:@"sounds"] UTF8String];     //isSoundEnabled
 	gameArgs[3] = [[systemSettings objectForKey:@"music"] UTF8String];      //isMusicEnabled
@@ -338,6 +347,7 @@
     [hSize release];
 	[localeString release];
 	[ipcString release];
+    [username release];
 	return gameArgs;
 }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cocoaTouch/GeneralSettingsViewController.h	Tue Apr 06 18:14:15 2010 +0000
@@ -0,0 +1,32 @@
+//
+//  SettingsViewController.h
+//  hwengine
+//
+//  Created by Vittorio on 08/01/10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+
+@interface GeneralSettingsViewController : UITableViewController <UIActionSheetDelegate> {
+    NSDictionary *dataDict;
+	NSString *username;
+	NSString *password;
+	UISwitch *musicSwitch;
+	UISwitch *soundSwitch;
+	UISwitch *altDamageSwitch;
+}
+
+@property (nonatomic, retain) NSDictionary *dataDict;
+@property (nonatomic, retain) NSString *username;
+@property (nonatomic, retain) NSString *password;
+@property (nonatomic, retain) UISwitch *musicSwitch;
+@property (nonatomic, retain) UISwitch *soundSwitch;
+@property (nonatomic, retain) UISwitch *altDamageSwitch;
+
+#define kNetworkFields 0
+#define kAudioFields 1
+#define kOtherFields 2
+
+@end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cocoaTouch/GeneralSettingsViewController.m	Tue Apr 06 18:14:15 2010 +0000
@@ -0,0 +1,339 @@
+//
+//  SettingsViewController.m
+//  hwengine
+//
+//  Created by Vittorio on 08/01/10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "GeneralSettingsViewController.h"
+#import "SDL_uikitappdelegate.h"
+
+@implementation GeneralSettingsViewController
+@synthesize dataDict, username, password, musicSwitch, soundSwitch, altDamageSwitch;
+
+-(void) dealloc {
+    [dataDict release];
+	[username release];
+	[password release];
+	[musicSwitch release];
+	[soundSwitch release];
+	[altDamageSwitch release];
+	[super dealloc];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
+}
+
+#pragma mark -
+#pragma mark View Lifecycle
+-(void) viewDidLoad {
+    self.musicSwitch = [[UISwitch alloc] init];
+	self.soundSwitch = [[UISwitch alloc] init];
+	self.altDamageSwitch = [[UISwitch alloc] init];
+	[self.soundSwitch addTarget:self action:@selector(sameValueSwitch) forControlEvents:UIControlEventValueChanged];
+	[self.musicSwitch addTarget:self action:@selector(checkValueSwitch) forControlEvents:UIControlEventValueChanged];
+    
+    NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"];
+    NSDictionary *dictionary = [[NSDictionary alloc] initWithContentsOfFile:filePath];
+    self.dataDict = dictionary;
+    [dictionary release];
+	[super viewDidLoad];
+}
+
+-(void) viewDidUnload {
+    self.dataDict = nil;
+	self.username = nil;
+	self.password = nil;
+	self.musicSwitch = nil;
+	self.soundSwitch = nil;
+	self.altDamageSwitch = nil;
+	[super viewDidUnload];
+}
+
+-(void) viewWillAppear:(BOOL)animated {
+    [self.tableView setContentOffset:CGPointMake(0,0) animated:NO];
+    
+    username = [NSString stringWithString:[dataDict objectForKey:@"username"]];
+    password = [NSString stringWithString:[dataDict objectForKey:@"password"]];   
+    
+    if (1 == [[dataDict objectForKey:@"music"] intValue]) {
+        musicSwitch.on = YES;
+    } else {
+        musicSwitch.on = NO;
+    }
+    if (1 == [[dataDict objectForKey:@"sounds"] intValue]) {
+        soundSwitch.on = YES;
+    } else {
+        soundSwitch.on = NO;
+    }
+    if (1 == [[dataDict objectForKey:@"alternate"] intValue]) {
+        altDamageSwitch.on = YES;
+    } else {
+        altDamageSwitch.on = NO;
+    }
+
+    [super viewWillAppear:animated];
+}
+
+-(void) viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    
+	NSMutableDictionary *saveDict = [[NSMutableDictionary alloc] init];
+	NSString *tmpMus = (musicSwitch.on) ? @"1" : @"0";
+	NSString *tmpEff = (soundSwitch.on) ? @"1" : @"0";
+	NSString *tmpAlt = (altDamageSwitch.on) ? @"1" : @"0";
+	 
+	[saveDict setObject:username forKey:@"username"];
+	[saveDict setObject:password forKey:@"password"];
+	[saveDict setObject:tmpMus forKey:@"music"];
+	[saveDict setObject:tmpEff forKey:@"sounds"];
+	[saveDict setObject:tmpAlt forKey:@"alternate"];
+	
+    if (![dataDict isEqualToDictionary:saveDict]) {
+       	NSLog(@"writing preferences to file");
+        [saveDict writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES];
+        // this will also relase the previous dictionary
+        self.dataDict = saveDict;
+    }
+	[saveDict release];
+}
+
+#pragma mark -
+// set music off when sound is turned off
+-(void) sameValueSwitch {
+	if (YES == self.musicSwitch.on) {
+		[musicSwitch setOn:NO animated:YES];
+	}
+}
+
+// don't enable music when sound is off
+-(void) checkValueSwitch {
+	if (NO == self.soundSwitch.on) {
+		[musicSwitch setOn:!musicSwitch.on animated:YES];
+	}
+}
+
+/*
+// makes the keyboard go away when background is tapped
+-(IBAction) backgroundTap: (id)sender {
+//	[username resignFirstResponder];
+//	[password resignFirstResponder];
+}
+
+// makes the keyboard go away when "Done" is tapped
+-(IBAction) textFieldDoneEditing: (id)sender {
+	[sender resignFirstResponder];
+}
+*/
+
+/*
+#pragma mark -
+#pragma mark UIActionSheet Methods
+-(IBAction) deleteData: (id)sender {
+	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"")
+								 delegate:self
+							cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"")
+						   destructiveButtonTitle:NSLocalizedString(@"As sure as I can be!", @"")
+							otherButtonTitles:nil];
+	[actionSheet showInView:self.view];
+	[actionSheet release];
+}
+
+-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
+	if ([actionSheet cancelButtonIndex] != buttonIndex) {
+		// get the documents dirctory
+		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+		NSString *documentsDirectory = [paths objectAtIndex:0];
+		
+		// get the content of the directory
+		NSFileManager *fm = [NSFileManager defaultManager];
+		NSArray *dirContent = [fm directoryContentsAtPath:documentsDirectory];
+		NSError *error;
+		
+		// delete data
+		for (NSString *fileName in dirContent) {
+			[fm removeItemAtPath:[documentsDirectory stringByAppendingPathComponent:fileName] error:&error];
+		}
+		
+		// force resetting
+		UIAlertView *anAlert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Hit Home Button to Exit", @"")
+								  message:NSLocalizedString(@"\nEverything is gone!\nNow you need to restart the game...", @"")
+								 delegate:self
+							cancelButtonTitle:nil
+							otherButtonTitles:nil];
+		[anAlert show];
+		[anAlert release];
+	}
+}
+*/
+
+#pragma mark -
+#pragma mark TableView Methods
+-(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+	return 3;
+}
+
+-(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+	switch (section) {
+		case kNetworkFields:
+			return 2;
+			break;
+		case kAudioFields:
+			return 2;
+			break;
+		case kOtherFields:
+			return 1;
+			break;
+		default:
+			NSLog(@"Warning: unset case value for numberOfRowsInSection!");
+			break;
+	}
+	return 0;
+}
+
+-(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+	static NSString *cellIdentifier1 = @"systemSettingsCell1";
+	static NSString *cellIdentifier2 = @"systemSettingsCell2";
+	
+	UITableViewCell *cell = nil;
+	
+	switch ([indexPath section]) {
+		case kNetworkFields:
+            cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier1];
+            if (nil == cell) {
+                cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1
+                                           reuseIdentifier:cellIdentifier1] autorelease];
+            }
+            cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+            
+			switch ([indexPath row]) {
+				case 0:                    
+					cell.textLabel.text = NSLocalizedString(@"Nickname", @"");
+                    if ([username isEqualToString:@""]) {
+                        cell.detailTextLabel.text = @"insert username...";
+                        cell.detailTextLabel.font = [UIFont italicSystemFontOfSize:[UIFont systemFontSize]];
+                        cell.detailTextLabel.textColor = [UIColor grayColor];
+                    } else {
+                        cell.detailTextLabel.text = username;
+                    }
+					break;
+				case 1:                    
+					cell.textLabel.text = NSLocalizedString(@"Password", @"");
+                    if ([password isEqualToString:@""]) {
+                        cell.detailTextLabel.text = @"insert password...";
+                        cell.detailTextLabel.font = [UIFont italicSystemFontOfSize:[UIFont systemFontSize]];
+                        cell.detailTextLabel.textColor = [UIColor grayColor];
+                    } else {
+                        cell.detailTextLabel.text = @"••••••••";
+                    }
+					break;
+				default:
+					NSLog(@"Warning: unset case value in kNetworkFields section!");
+					break;
+			}
+			break;
+            
+		case kAudioFields:
+            cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier2];
+            if (nil == cell) {
+                cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                                               reuseIdentifier:cellIdentifier2] autorelease];
+            }
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
+
+			switch ([indexPath row]) {
+				case 0:
+					cell.textLabel.text = NSLocalizedString(@"Sound", @"");
+					cell.accessoryView = soundSwitch;
+					break;
+				case 1:
+					cell.textLabel.text = NSLocalizedString(@"Music", @"");
+					cell.accessoryView = musicSwitch;
+					break;
+				default:
+					NSLog(@"Warning: unset case value in kAudioFields section!");
+					break;
+			}
+            // this makes the row not selectable
+			break;
+            
+		case kOtherFields:
+            cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier2];
+            if (nil == cell) {
+                cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                                               reuseIdentifier:cellIdentifier2] autorelease];
+            }
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
+			cell.textLabel.text = NSLocalizedString(@"Alternate Damage", @"");
+			cell.accessoryView = altDamageSwitch;
+			break;
+		default:
+			break;
+	}
+	return cell;
+}
+
+-(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+    NSString *sectionTitle = nil;
+    switch (section) {
+		case kNetworkFields:
+			sectionTitle = NSLocalizedString(@"Network Configuration", @"");
+			break;
+		case kAudioFields:
+			sectionTitle = NSLocalizedString(@"Audio Preferences", @"");
+			break;
+		case kOtherFields:
+			sectionTitle = NSLocalizedString(@"Other Settings", @"");
+			break;
+		default:
+			NSLog(@"Nope");
+			break;
+	}
+    return sectionTitle;
+}
+
+/*
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+	UIView *containerView =	[[[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)] autorelease];
+	UILabel *headerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(10, 20, 300, 40)] autorelease];
+	headerLabel.textColor = [UIColor lightGrayColor];
+	headerLabel.shadowColor = [UIColor blackColor];
+	headerLabel.shadowOffset = CGSizeMake(0, 1);
+	headerLabel.font = [UIFont boldSystemFontOfSize:20];
+	headerLabel.backgroundColor = [UIColor clearColor];
+
+	switch (section) {
+		case kNetworkFields:
+			headerLabel.text = NSLocalizedString(@"Network Configuration", @"");
+			break;
+		case kAudioFields:
+			headerLabel.text = NSLocalizedString(@"Audio Preferences", @"");
+			break;
+		case kOtherFields:
+			headerLabel.text = NSLocalizedString(@"Other Settings", @"");
+			break;
+		default:
+			NSLog(@"Warning: unset case value in titleForHeaderInSection!");
+			headerLabel.text = @"!";
+			break;
+	}
+	
+	[containerView addSubview:headerLabel];
+	return containerView;
+}
+
+-(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+	if (kAudioFields == [indexPath section] && 2 == [indexPath row])
+		return volumeCell.frame.size.height;
+	else
+		return table.rowHeight;
+}
+
+-(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+	return 57.0;
+}
+*/
+
+@end
--- a/cocoaTouch/HogHatViewController.m	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/HogHatViewController.m	Tue Apr 06 18:14:15 2010 +0000
@@ -49,7 +49,7 @@
     // this updates the hog name and its hat
     [self.tableView reloadData];
     // this moves the tableview to the top
-    [self.tableView setContentOffset:CGPointMake(0, 0) animated:NO];
+    [self.tableView setContentOffset:CGPointMake(0,0) animated:NO];
 }
 
 /*
--- a/cocoaTouch/MainMenuViewController.h	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.h	Tue Apr 06 18:14:15 2010 +0000
@@ -7,7 +7,6 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "SettingsViewController.h"
 
 @interface MainMenuViewController : UIViewController {
     UIView *cover;
--- a/cocoaTouch/MainMenuViewController.m	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/MainMenuViewController.m	Tue Apr 06 18:14:15 2010 +0000
@@ -72,8 +72,6 @@
                                                        delegate:nil
                                               cancelButtonTitle:nil
                                               otherButtonTitles:nil];
-		[alert show];
-		[alert release];
 
 		UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] 
                                               initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
@@ -81,6 +79,8 @@
 		[indicator startAnimating];
 		[alert addSubview:indicator];
 		[indicator release];
+		[alert show];
+		[alert release];
 		
         // create Default Team.plist
         NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
--- a/cocoaTouch/MasterViewController.h	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/MasterViewController.h	Tue Apr 06 18:14:15 2010 +0000
@@ -14,10 +14,12 @@
 @interface MasterViewController : UITableViewController {
     DetailViewController *detailViewController;
     NSArray *optionList;
+    NSArray *controllers;
 }
 
-@property (nonatomic, retain) IBOutlet DetailViewController *detailViewController;
+@property (nonatomic, retain) DetailViewController *detailViewController;
 @property (nonatomic, retain) NSArray *optionList;
+@property (nonatomic, retain) NSArray *controllers;
 
 -(IBAction) dismissSplitView;
 
--- a/cocoaTouch/MasterViewController.m	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/MasterViewController.m	Tue Apr 06 18:14:15 2010 +0000
@@ -8,10 +8,11 @@
 
 #import "MasterViewController.h"
 #import "DetailViewController.h"
+#import "GeneralSettingsViewController.h"
 #import "TeamSettingsViewController.h"
 
 @implementation MasterViewController
-@synthesize detailViewController, optionList;
+@synthesize detailViewController, optionList, controllers;
 
 #pragma mark -
 #pragma mark View lifecycle
@@ -24,8 +25,28 @@
                                                   NSLocalizedString(@"Weapons",@""),
                                                   NSLocalizedString(@"Schemes",@""),
                                                   nil];
-    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0 target:self action:@selector(dismissSplitView)];
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:0
+                                                                                          target:self
+                                                                                          action:@selector(dismissSplitView)];
+
+    NSMutableArray *array= [[NSMutableArray alloc] init];
 
+    GeneralSettingsViewController *generalSettingsViewController = [[GeneralSettingsViewController alloc]
+                                                                    initWithStyle:UITableViewStyleGrouped];
+    generalSettingsViewController.title = NSLocalizedString(@"General",@"");
+    generalSettingsViewController.navigationItem.hidesBackButton = YES;
+    [array addObject:generalSettingsViewController];
+    [generalSettingsViewController release];
+    
+    TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] 
+                                                              initWithStyle:UITableViewStyleGrouped];
+    teamSettingsViewController.title = NSLocalizedString(@"Teams",@"");
+    teamSettingsViewController.navigationItem.hidesBackButton = YES;
+    [array addObject:teamSettingsViewController];
+    [teamSettingsViewController release];
+    
+    self.controllers = array;
+    [array release];
     // Uncomment the following line to preserve selection between presentations.
     //self.clearsSelectionOnViewWillAppear = NO;
     // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
@@ -96,12 +117,10 @@
 -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     
     [detailViewController.navigationController popToRootViewControllerAnimated:NO];
-    TeamSettingsViewController *teamSettingsViewController = [[TeamSettingsViewController alloc] 
-                                                              initWithStyle:UITableViewStyleGrouped];
-    teamSettingsViewController.title = [optionList objectAtIndex:[indexPath row]];
-    teamSettingsViewController.navigationItem.hidesBackButton = YES;
 
-    [detailViewController.navigationController pushViewController: teamSettingsViewController animated:YES];
+    NSInteger row = [indexPath row];
+    UITableViewController *nextController = [self.controllers objectAtIndex:row];
+    [detailViewController.navigationController pushViewController:nextController animated:YES];
 }
 
 
--- a/cocoaTouch/SettingsViewController.h	Tue Apr 06 14:32:26 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-//
-//  SettingsViewController.h
-//  hwengine
-//
-//  Created by Vittorio on 08/01/10.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface SettingsViewController : UIViewController 
-		<UITableViewDelegate, UITableViewDataSource, UIActionSheetDelegate> {
-	UITextField *username;
-	UITextField *password;
-	UISwitch *musicSwitch;
-	UISwitch *soundsSwitch;
-	UISwitch *altDamageSwitch;
-	UITableView *settingsTable;
-	UITableViewCell *volumeCell;
-	UIView *buttonContainer;
-	UIView *parentView;
-}
-
-@property (nonatomic, retain) IBOutlet UITextField *username;
-@property (nonatomic, retain) IBOutlet UITextField *password;
-@property (nonatomic, retain) UISwitch *musicSwitch;
-@property (nonatomic, retain) UISwitch *soundsSwitch;
-@property (nonatomic, retain) UISwitch *altDamageSwitch;
-@property (nonatomic, retain) IBOutlet UITableView *settingsTable;
-@property (nonatomic, retain) IBOutlet UIView *buttonContainer;
-@property (nonatomic, retain) UIView *parentView;
-
--(IBAction) backgroundTap: (id)sender;
--(IBAction) textFieldDoneEditing: (id)sender;
--(IBAction) deleteData: (id)sender;
-@end
--- a/cocoaTouch/SettingsViewController.m	Tue Apr 06 14:32:26 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,320 +0,0 @@
-//
-//  SettingsViewController.m
-//  hwengine
-//
-//  Created by Vittorio on 08/01/10.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import "SettingsViewController.h"
-#import "SDL_uikitappdelegate.h"
-
-@implementation SettingsViewController
-
-@synthesize username, password, musicSwitch, soundsSwitch, altDamageSwitch, 
-	    settingsTable, buttonContainer, parentView;
-
-
--(void) loadView {
-	self.musicSwitch = [[UISwitch alloc] init];
-	self.soundsSwitch = [[UISwitch alloc] init];
-	self.altDamageSwitch = [[UISwitch alloc] init];
-	[self.soundsSwitch addTarget:self action:@selector(sameValueSwitch) forControlEvents:UIControlEventValueChanged];
-	[self.musicSwitch addTarget:self action:@selector(checkValueSwitch) forControlEvents:UIControlEventValueChanged];
-
-	[super loadView];
-}
-
--(void) viewDidLoad {
-	NSString *filePath = [[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"];
-	
-	if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) {	
-		NSMutableDictionary *data = [[NSMutableDictionary alloc] initWithContentsOfFile:filePath];
-		username.text = [data objectForKey:@"username"];
-		password.text = [data objectForKey:@"password"];
-		if (1 == [[data objectForKey:@"music"] intValue]) {
-			musicSwitch.on = YES;
-		} else {
-			musicSwitch.on = NO;
-		}
-		if (1 == [[data objectForKey:@"sounds"] intValue]) {
-			soundsSwitch.on = YES;
-		} else {
-			soundsSwitch.on = NO;
-		}
-		if (1 == [[data objectForKey:@"alternate"] intValue]) {
-			altDamageSwitch.on = YES;
-		} else {
-			altDamageSwitch.on = NO;
-		}		
-		[data release];
-	} else {
-		[NSException raise:@"File NOT found" format:@"The file settings.plist was not found at %@", filePath];
-	}
-	
-	
-	username.textColor = [UIColor grayColor];
-	password.textColor = [UIColor grayColor];
-	settingsTable.backgroundColor = [UIColor clearColor];
-	settingsTable.allowsSelection = NO;
-	buttonContainer.backgroundColor = [UIColor clearColor];
-	settingsTable.tableFooterView = buttonContainer;
-	
-	[super viewDidLoad];
-}
-
--(void) viewDidUnload {
-	self.username = nil;
-	self.password = nil;
-	self.musicSwitch = nil;
-	self.soundsSwitch = nil;
-	self.altDamageSwitch = nil;
-	self.settingsTable = nil;
-	self.buttonContainer = nil;
-	[super viewDidUnload];
-}
-
--(void) dealloc {
-	[username release];
-	[password release];
-	[musicSwitch release];
-	[soundsSwitch release];
-	[altDamageSwitch release];
-	[settingsTable release];
-	[buttonContainer release];
-	[super dealloc];
-}
-
-// Override to allow orientations other than the default portrait orientation.
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
-}
-
-// makes the keyboard go away when background is tapped
--(IBAction) backgroundTap: (id)sender {
-	[username resignFirstResponder];
-	[password resignFirstResponder];
-}
-
-// makes the keyboard go away when "Done" is tapped
--(IBAction) textFieldDoneEditing: (id)sender {
-	[sender resignFirstResponder];
-}
-
-// set music off when sound is turned off
--(void) sameValueSwitch {
-	if (YES == self.musicSwitch.on) {
-		[musicSwitch setOn:NO animated:YES];
-	}
-}
-
-// don't enable music when sound is off
--(void) checkValueSwitch {
-	if (NO == self.soundsSwitch.on) {
-		[musicSwitch setOn:!musicSwitch.on animated:YES];
-	}
-}
-
-#pragma mark -
-#pragma mark Return to mainView
--(void) flushData {
-	NSLog(@"writing preferences to file");
-
-	NSMutableDictionary *saveDict = [[NSMutableDictionary alloc] init];
-	NSString *tmpMus = (musicSwitch.on) ? @"1" : @"0";
-	NSString *tmpEff = (soundsSwitch.on) ? @"1" : @"0";
-	NSString *tmpAlt = (altDamageSwitch.on) ? @"1" : @"0";
-	
-	[saveDict setObject:username.text forKey:@"username"];
-	[saveDict setObject:password.text forKey:@"password"];
-	[saveDict setObject:tmpMus forKey:@"music"];
-	[saveDict setObject:tmpEff forKey:@"sounds"];
-	[saveDict setObject:tmpAlt forKey:@"alternate"];
-	
-	[saveDict writeToFile:[[SDLUIKitDelegate sharedAppDelegate] dataFilePath:@"settings.plist"] atomically:YES];
-	[saveDict release];
-}
-
--(void) returnMainView {
-	[self flushData];
-    //[self dismissModalViewControllerAnimated:YES]
-
-	[UIView beginAnimations:@"Get Back" context:NULL];
-	[UIView setAnimationDuration:1];
-	
-	self.view.frame = CGRectMake(0, -257, 480, 278);
-	self.parentView.frame = CGRectMake(0, 21, 480, 278);
-	[UIView commitAnimations];
-	
-	[self.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1];
-	self.parentView = nil;
-}
-
-#pragma mark -
-#pragma mark UIActionSheet Methods
--(IBAction) deleteData: (id)sender {
-	/* temporary commented out
-	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you reeeeeally sure?", @"")
-								 delegate:self
-							cancelButtonTitle:NSLocalizedString(@"Well, maybe not...", @"")
-						   destructiveButtonTitle:NSLocalizedString(@"As sure as I can be!", @"")
-							otherButtonTitles:nil];
-	[actionSheet showInView:self.view];
-	[actionSheet release];
-	 */
-	[self returnMainView];
-}
-
--(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
-	if ([actionSheet cancelButtonIndex] != buttonIndex) {
-		// get the documents dirctory
-		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-		NSString *documentsDirectory = [paths objectAtIndex:0];
-		
-		// get the content of the directory
-		NSFileManager *fm = [NSFileManager defaultManager];
-		NSArray *dirContent = [fm directoryContentsAtPath:documentsDirectory];
-		NSError *error;
-		
-		// delete data
-		for (NSString *fileName in dirContent) {
-			[fm removeItemAtPath:[documentsDirectory stringByAppendingPathComponent:fileName] error:&error];
-		}
-		
-		// force resetting
-		UIAlertView *anAlert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Hit Home Button to Exit", @"")
-								  message:NSLocalizedString(@"\nEverything is gone!\nNow you need to restart the game...", @"")
-								 delegate:self
-							cancelButtonTitle:nil
-							otherButtonTitles:nil];
-		[anAlert show];
-		[anAlert release];
-	}
-}
-
-#pragma mark -
-#pragma mark TableView Methods
-#define kNetworkFields 0
-#define kAudioFields 1
-#define kOtherFields 2
-
--(NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
-	return 3;
-}
-
--(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-	switch (section) {
-		case kNetworkFields:
-			return 2;
-			break;
-		case kAudioFields:
-			return 2;
-			break;
-		case kOtherFields:
-			return 1;
-			break;
-		default:
-			NSLog(@"Warning: unset case value for numberOfRowsInSection!");
-			break;
-	}
-	return 0;
-}
-
--(UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	static NSString *cellIdentifier = @"systemSettingsCell";
-	
-	UITableViewCell *cell;
-	if ( !(kAudioFields == [indexPath section] && 2 == [indexPath row]) ){
-		cell = [aTableView dequeueReusableCellWithIdentifier:cellIdentifier];
-		if (nil == cell) {
-			cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
-						       reuseIdentifier:cellIdentifier] autorelease];
-		}
-	}
-	
-	switch ([indexPath section]) {
-		case kNetworkFields:
-			switch ([indexPath row]) {
-				case 0:
-					cell.textLabel.text = NSLocalizedString(@"Nickname", @"");
-					cell.accessoryView = username;
-					break;
-				case 1:
-					cell.textLabel.text = NSLocalizedString(@"Password", @"");
-					cell.accessoryView = password;
-					break;
-				default:
-					NSLog(@"Warning: unset case value in kNetworkFields section!");
-					break;
-			}
-			break;
-		case kAudioFields:
-			switch ([indexPath row]) {
-				case 0:
-					cell.accessoryView = soundsSwitch;
-					cell.textLabel.text = NSLocalizedString(@"Sound", @"");
-					break;
-				case 1:
-					cell.accessoryView = musicSwitch;
-					cell.textLabel.text = NSLocalizedString(@"Music", @"");
-					break;
-				default:
-					NSLog(@"Warning: unset case value in kAudioFields section!");
-					break;
-			}
-			break;
-		case kOtherFields:
-			cell.accessoryView = altDamageSwitch;
-			cell.textLabel.text = NSLocalizedString(@"Alternate Damage", @"");
-			break;
-		default:
-			break;
-	}
-	
-	return cell;
-}
-
--(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
-	UIView *containerView =	[[[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)] autorelease];
-	UILabel *headerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(10, 20, 300, 40)] autorelease];
-	headerLabel.textColor = [UIColor lightGrayColor];
-	headerLabel.shadowColor = [UIColor blackColor];
-	headerLabel.shadowOffset = CGSizeMake(0, 1);
-	headerLabel.font = [UIFont boldSystemFontOfSize:20];
-	headerLabel.backgroundColor = [UIColor clearColor];
-
-	switch (section) {
-		case kNetworkFields:
-			headerLabel.text = NSLocalizedString(@"Network Configuration", @"");
-			break;
-		case kAudioFields:
-			headerLabel.text = NSLocalizedString(@"Audio Preferences", @"");
-			break;
-		case kOtherFields:
-			headerLabel.text = NSLocalizedString(@"Other Settings", @"");
-			break;
-		default:
-			NSLog(@"Warning: unset case value in titleForHeaderInSection!");
-			headerLabel.text = @"!";
-			break;
-	}
-	
-	[containerView addSubview:headerLabel];
-	return containerView;
-}
-
-/*
--(CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-	if (kAudioFields == [indexPath section] && 2 == [indexPath row])
-		return volumeCell.frame.size.height;
-	else
-		return table.rowHeight;
-}
-*/
-
--(CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-	return 57.0;
-}
-
-@end
--- a/cocoaTouch/SingleTeamViewController.h	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/SingleTeamViewController.h	Tue Apr 06 18:14:15 2010 +0000
@@ -11,13 +11,16 @@
 @class HogHatViewController;
 @interface SingleTeamViewController : UITableViewController {
     NSArray *hogsList;
+    NSArray *hatList;
     NSArray *secondaryItems;
+    
     NSString *teamName;
     
     HogHatViewController *hogChildController;
 }
 
 @property (nonatomic,retain) NSArray *hogsList;
+@property (nonatomic,retain) NSArray *hatList;
 @property (nonatomic,retain) NSArray *secondaryItems;
 @property (nonatomic,retain) NSString *teamName;
 @end
--- a/cocoaTouch/SingleTeamViewController.m	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/SingleTeamViewController.m	Tue Apr 06 18:14:15 2010 +0000
@@ -10,7 +10,7 @@
 #import "HogHatViewController.h"
 
 @implementation SingleTeamViewController
-@synthesize hogsList, secondaryItems, teamName;
+@synthesize hogsList, hatList, secondaryItems, teamName;
 
 
 #pragma mark -
@@ -38,15 +38,37 @@
 
 - (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];
     [teamFile release];
     
+    // grab the hog list
     self.hogsList = [teamDict objectForKey:@"hedgehogs"];
+    // grab the name of the team
     self.teamName = [teamDict objectForKey:@"teamname"];
+    self.title = self.teamName;
     [teamDict release];
-    self.title = teamName;
+    
+    // load the images of the hat for aach hog
+    NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:[self.hogsList count]];
+    for (NSDictionary *hog in self.hogsList) {
+        NSString *hatFile = [[NSString alloc] initWithFormat:@"%@/Data/Graphics/Hats/%@.png",[[NSBundle mainBundle] resourcePath],[hog objectForKey:@"hat"]];
+
+        UIImage *image = [[UIImage alloc] initWithContentsOfFile: hatFile];
+        CGRect firstSpriteArea = CGRectMake(0, 0, 32, 32);
+        CGImageRef cgImgage = CGImageCreateWithImageInRect([image CGImage], firstSpriteArea);
+        [image release];
+        
+        UIImage *hatSprite = [[UIImage alloc] initWithCGImage:cgImgage];
+        [array addObject:hatSprite];
+        CGImageRelease(cgImgage);
+        [hatSprite release];
+    }
+    self.hatList = array;
+    [array release];
 }
 
 /*
@@ -77,7 +99,7 @@
 }
 
 -(NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    NSInteger rows;
+    NSInteger rows = 0;
     switch (section) {
         case 0:
             rows = 1;
@@ -111,6 +133,7 @@
         case 1:
             cell.textLabel.text = [[self.hogsList objectAtIndex:row] objectForKey:@"hogname"];
             cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+            cell.imageView.image = [self.hatList objectAtIndex:row];
             break;
         case 2:
             cell.textLabel.text = [self.secondaryItems objectAtIndex:row];
--- a/cocoaTouch/SplitViewRootController.m	Tue Apr 06 14:32:26 2010 +0000
+++ b/cocoaTouch/SplitViewRootController.m	Tue Apr 06 18:14:15 2010 +0000
@@ -55,6 +55,7 @@
     } else {
         detailedNavController = [[UINavigationController alloc] initWithRootViewController:detailViewController];
         [self.view addSubview:detailedNavController.view];
+        // TODO: we are leaking here!!!
     }
 
     [super viewDidLoad];
--- a/hedgewars/hwengine.pas	Tue Apr 06 14:32:26 2010 +0000
+++ b/hedgewars/hwengine.pas	Tue Apr 06 18:14:15 2010 +0000
@@ -244,8 +244,8 @@
 
     UserNick:= gameArgs[0];
     val(gameArgs[1], ipcPort);
-    isSoundEnabled:= false;//gameArgs[2] = '1';
-    isMusicEnabled:= false;//gameArgs[3] = '1';
+    isSoundEnabled:= gameArgs[2] = '1';
+    isMusicEnabled:= gameArgs[3] = '1';
     cLocaleFName:= gameArgs[4];
     cAltDamage:= gameArgs[5] = '1';
     val(gameArgs[6], cScreenHeight);
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj	Tue Apr 06 14:32:26 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/project.pbxproj	Tue Apr 06 18:14:15 2010 +0000
@@ -25,6 +25,7 @@
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		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 */; };
 		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 */; };
@@ -176,6 +177,8 @@
 		28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		32CA4F630368D1EE00C91783 /* HedgewarsMobile_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HedgewarsMobile_Prefix.pch; sourceTree = "<group>"; };
+		611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeneralSettingsViewController.h; path = ../../cocoaTouch/GeneralSettingsViewController.h; sourceTree = SOURCE_ROOT; };
+		611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GeneralSettingsViewController.m; path = ../../cocoaTouch/GeneralSettingsViewController.m; sourceTree = SOURCE_ROOT; };
 		611FD9C81155A1F200C2203D /* Background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Background.png; path = ../../QTfrontend/res/Background.png; sourceTree = SOURCE_ROOT; };
 		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; };
@@ -428,6 +431,15 @@
 			path = Classes;
 			sourceTree = "<group>";
 		};
+		611B0A94116B621600112153 /* General */ = {
+			isa = PBXGroup;
+			children = (
+				611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */,
+				611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */,
+			);
+			name = General;
+			sourceTree = "<group>";
+		};
 		61798860114AA49D00BA94A9 /* SDLOverrides */ = {
 			isa = PBXGroup;
 			children = (
@@ -544,6 +556,7 @@
 				61A11AC81168DA9400359010 /* MasterViewController.m */,
 				61A11AD41168DB3700359010 /* DetailViewController.h */,
 				61A11AD51168DB3700359010 /* DetailViewController.m */,
+				611B0A94116B621600112153 /* General */,
 				61A11AD01168DB1F00359010 /* Teams */,
 			);
 			name = Settings;
@@ -788,7 +801,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#cd ${PROJECT_DIR}/build/HedgewarsMobile.build/Debug-iphonesimulator/iHedgewars.build/DerivedSources-normal/\n#rm -fr i386/\n#ln -sf ../../HedgewarsMobile.build/DerivedSources-normal/i386/ i386\n#cd ${PROJECT_DIR}\n\n#copy new stuff over old stuff\nsvn export --force ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#delete all CMakeLists.txt\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#the following ones must be removed when their support is implemented\n\n#delete all sound files\nrm -rf ${PROJECT_DIR}/Data/Sounds/\nrm -rf ${PROJECT_DIR}/Data/Music/\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all forts\nrm -rf ${PROJECT_DIR}/Data/Forts/\n\n#delete all forts\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/";
+			shellScript = "#cd ${PROJECT_DIR}/build/HedgewarsMobile.build/Debug-iphonesimulator/iHedgewars.build/DerivedSources-normal/\n#rm -fr i386/\n#ln -sf ../../HedgewarsMobile.build/DerivedSources-normal/i386/ i386\n#cd ${PROJECT_DIR}\n\n#copy new stuff over old stuff\nsvn export --force ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#the following ones must be removed when their support is implemented\n\n#delete all sound files\nrm -rf ${PROJECT_DIR}/Data/Sounds/\nrm -rf ${PROJECT_DIR}/Data/Music/\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all forts\nrm -rf ${PROJECT_DIR}/Data/Forts/\n\n#delete all reserved hats\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/";
 			showEnvVarsInLog = 0;
 		};
 		9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {
@@ -878,6 +891,7 @@
 				61A11AD61168DB3700359010 /* DetailViewController.m in Sources */,
 				61A11AE11168DC6E00359010 /* SingleTeamViewController.m in Sources */,
 				61A11AE41168DC9400359010 /* HogHatViewController.m in Sources */,
+				611B0AA1116B626E00112153 /* GeneralSettingsViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Tue Apr 06 14:32:26 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3	Tue Apr 06 18:14:15 2010 +0000
@@ -202,66 +202,24 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>61CEDABE116AC0330067BAFC</string>
+				<string>611B0C49116BAF3A00112153</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>OverlayViewController.m</string>
+				<string>HogHatViewController.m</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>61CEDABF116AC0330067BAFC</string>
+						<string>611B0C4A116BAF3A00112153</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>OverlayViewController.m</string>
+						<string>HogHatViewController.m</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>61CEDD03116AE0D20067BAFC</string>
+						<string>611B0C72116BB12800112153</string>
 						<key>history</key>
 						<array>
-							<string>61CEDCEB116ADFD70067BAFC</string>
-							<string>61CEDCEC116ADFD70067BAFC</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}, {938, 870}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>690 205 938 911 0 0 1920 1178 </string>
-			</dict>
-		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>61CEDAB9116AC0330067BAFC</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>PopoverMenuViewController.h</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>61CEDABA116AC0330067BAFC</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>PopoverMenuViewController.h</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>61CEDD04116AE0D20067BAFC</string>
-						<key>history</key>
-						<array>
-							<string>61CEDB2A116AC8250067BAFC</string>
-							<string>61CEDABB116AC0330067BAFC</string>
+							<string>611B0C3A116BAC7700112153</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -277,7 +235,7 @@
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>84 374 1058 736 0 0 1920 1178 </string>
+				<string>694 343 1058 736 0 0 1920 1178 </string>
 			</dict>
 		</dict>
 	</array>
@@ -352,22 +310,23 @@
 								<string>080E96DDFE201D6D7F000001</string>
 								<string>61A118481168371400359010</string>
 								<string>61A11AC31168DA2B00359010</string>
+								<string>611B0A94116B621600112153</string>
+								<string>61A11AD01168DB1F00359010</string>
 								<string>29B97317FDCFA39411CA2CEA</string>
 								<string>1C37FBAC04509CD000000102</string>
+								<string>611B0B0F116B734500112153</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>11</integer>
-									<integer>5</integer>
-									<integer>4</integer>
-									<integer>2</integer>
-									<integer>0</integer>
+									<integer>49</integer>
+									<integer>48</integer>
+									<integer>45</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 136}, {235, 558}}</string>
+							<string>{{0, 320}, {235, 558}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -402,7 +361,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>DetailViewController.m</string>
+								<string>HogHatViewController.m</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -410,11 +369,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>DetailViewController.m</string>
+										<string>HogHatViewController.m</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>61CEDD02116AE0D20067BAFC</string>
+										<string>611B0C71116BB12800112153</string>
 										<key>history</key>
 										<array>
 											<string>6179889D114AA5BD00BA94A9</string>
@@ -442,7 +401,6 @@
 											<string>61CE23E7115E49560098C467</string>
 											<string>61CE23FF115E4B290098C467</string>
 											<string>61CE2514115E74CC0098C467</string>
-											<string>61CE2515115E74CC0098C467</string>
 											<string>61CE251F115E75A70098C467</string>
 											<string>61CE2577115E78900098C467</string>
 											<string>61CCBE60116135FF00833FE8</string>
@@ -472,23 +430,26 @@
 											<string>612D618F1165545F00C6D842</string>
 											<string>61430D3B1165551600E2C62D</string>
 											<string>61430D3D1165551600E2C62D</string>
-											<string>615F12CF11655B21002444F2</string>
 											<string>615F1316116561BE002444F2</string>
 											<string>615F134D11656569002444F2</string>
 											<string>615F147F11659AC5002444F2</string>
-											<string>615F15B9116629A0002444F2</string>
 											<string>615F198C1166A71E002444F2</string>
 											<string>615F198E1166A71E002444F2</string>
 											<string>615F19911166A71E002444F2</string>
 											<string>61CEDAA1116ABECE0067BAFC</string>
 											<string>61CEDAA2116ABECE0067BAFC</string>
 											<string>61CEDAA3116ABECE0067BAFC</string>
-											<string>61CEDAB7116AC0330067BAFC</string>
 											<string>61CEDB37116AC9230067BAFC</string>
 											<string>61CEDB5F116ACBBB0067BAFC</string>
 											<string>61CEDB60116ACBBB0067BAFC</string>
 											<string>61CEDC94116ADCB80067BAFC</string>
-											<string>61CEDC95116ADCB80067BAFC</string>
+											<string>611B0AC6116B6E8B00112153</string>
+											<string>611B0AC7116B6E8B00112153</string>
+											<string>611B0AC8116B6E8B00112153</string>
+											<string>611B0B84116B817C00112153</string>
+											<string>611B0BE9116BA1CC00112153</string>
+											<string>611B0C42116BAF3A00112153</string>
+											<string>61CEDAB7116AC0330067BAFC</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -500,14 +461,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {544, 54}}</string>
+								<string>{{0, 0}, {544, 35}}</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>54pt</string>
+							<string>35pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -520,14 +481,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 59}, {544, 517}}</string>
+								<string>{{0, 40}, {544, 536}}</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>517pt</string>
+							<string>536pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -546,9 +507,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>61CED548116AA9EE0067BAFC</string>
+				<string>611B0A98116B622000112153</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>61CED549116AA9EE0067BAFC</string>
+				<string>611B0A99116B622000112153</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -686,14 +647,14 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>61CED57E116AB1830067BAFC</string>
-		<string>61CED57F116AB1830067BAFC</string>
+		<string>611B0C73116BB12800112153</string>
+		<string>611B0AD3116B6E8B00112153</string>
+		<string>611B0AD4116B6E8B00112153</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>61798848114AA42600BA94A9</string>
-		<string>61CEDAB9116AC0330067BAFC</string>
+		<string>1C78EAAD065D492600B07095</string>
 		<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
-		<string>1C78EAAD065D492600B07095</string>
-		<string>61CEDABE116AC0330067BAFC</string>
+		<string>611B0C49116BAF3A00112153</string>
 	</array>
 	<key>WindowString</key>
 	<string>162 341 801 617 0 0 1920 1178 </string>
@@ -717,7 +678,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>CGPointUtils.c</string>
+								<string>SingleTeamViewController.m</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -775,7 +736,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>61798848114AA42600BA94A9</string>
-				<string>61CED54C116AA9EE0067BAFC</string>
+				<string>611B0A9B116B622000112153</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -899,13 +860,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>61CED572116AB1510067BAFC</string>
+				<string>611B0ABB116B66BE00112153</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>61CED573116AB1510067BAFC</string>
-				<string>61CED574116AB1510067BAFC</string>
-				<string>61CED575116AB1510067BAFC</string>
-				<string>61CED576116AB1510067BAFC</string>
-				<string>61CED577116AB1510067BAFC</string>
+				<string>611B0ABC116B66BE00112153</string>
+				<string>611B0ABD116B66BE00112153</string>
+				<string>611B0ABE116B66BE00112153</string>
+				<string>611B0ABF116B66BE00112153</string>
+				<string>611B0AC0116B66BE00112153</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -1069,7 +1030,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>61CED578116AB1510067BAFC</string>
+				<string>611B0AC1116B66BE00112153</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
--- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Tue Apr 06 14:32:26 2010 +0000
+++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser	Tue Apr 06 18:14:15 2010 +0000
@@ -9,7 +9,7 @@
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
 		activeBuildConfigurationName = Debug;
 		activeExecutable = 617987D7114AA2CD00BA94A9 /* HedgewarsMobile */;
-		activeSDKPreference = iphonesimulator3.1;
+		activeSDKPreference = iphonesimulator3.0;
 		activeTarget = 1D6058900D05DD3D006BFB54 /* HedgewarsMobile */;
 		addToTargets = (
 			1D6058900D05DD3D006BFB54 /* HedgewarsMobile */,
@@ -93,89 +93,310 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 292202984;
-			PBXWorkspaceStateSaveDate = 292202984;
+			PBXPerProjectTemplateStateSaveDate = 292250055;
+			PBXWorkspaceStateSaveDate = 292250055;
 		};
 		perUserProjectItems = {
-			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 */;
-			612D5C451165535400C6D842 /* PBXTextBookmark */ = 612D5C451165535400C6D842 /* PBXTextBookmark */;
-			612D616B1165536300C6D842 /* PBXTextBookmark */ = 612D616B1165536300C6D842 /* PBXTextBookmark */;
-			612D618F1165545F00C6D842 /* PBXTextBookmark */ = 612D618F1165545F00C6D842 /* PBXTextBookmark */;
-			61430D3B1165551600E2C62D /* PBXTextBookmark */ = 61430D3B1165551600E2C62D /* PBXTextBookmark */;
-			61430D3D1165551600E2C62D /* PBXTextBookmark */ = 61430D3D1165551600E2C62D /* PBXTextBookmark */;
-			615F12CF11655B21002444F2 /* PBXTextBookmark */ = 615F12CF11655B21002444F2 /* PBXTextBookmark */;
-			615F1316116561BE002444F2 /* PBXTextBookmark */ = 615F1316116561BE002444F2 /* PBXTextBookmark */;
-			615F134D11656569002444F2 /* PBXTextBookmark */ = 615F134D11656569002444F2 /* PBXTextBookmark */;
-			615F147F11659AC5002444F2 /* PBXTextBookmark */ = 615F147F11659AC5002444F2 /* PBXTextBookmark */;
-			615F15B9116629A0002444F2 /* PBXTextBookmark */ = 615F15B9116629A0002444F2 /* 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 */;
-			61CE2515115E74CC0098C467 /* PBXTextBookmark */ = 61CE2515115E74CC0098C467 /* PBXTextBookmark */;
-			61CE251F115E75A70098C467 /* PBXBookmark */ = 61CE251F115E75A70098C467 /* PBXBookmark */;
-			61CE2577115E78900098C467 /* PBXTextBookmark */ = 61CE2577115E78900098C467 /* PBXTextBookmark */;
-			61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */ = 61CEDAA1116ABECE0067BAFC /* PBXTextBookmark */;
-			61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */ = 61CEDAA2116ABECE0067BAFC /* PBXTextBookmark */;
-			61CEDAA3116ABECE0067BAFC /* PBXTextBookmark */ = 61CEDAA3116ABECE0067BAFC /* PBXTextBookmark */;
-			61CEDAB7116AC0330067BAFC /* PBXTextBookmark */ = 61CEDAB7116AC0330067BAFC /* PBXTextBookmark */;
-			61CEDABB116AC0330067BAFC /* PBXTextBookmark */ = 61CEDABB116AC0330067BAFC /* PBXTextBookmark */;
-			61CEDB2A116AC8250067BAFC /* PBXTextBookmark */ = 61CEDB2A116AC8250067BAFC /* PBXTextBookmark */;
-			61CEDB37116AC9230067BAFC /* PBXTextBookmark */ = 61CEDB37116AC9230067BAFC /* PBXTextBookmark */;
-			61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB5F116ACBBB0067BAFC /* PBXTextBookmark */;
-			61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */ = 61CEDB60116ACBBB0067BAFC /* PBXTextBookmark */;
-			61CEDC94116ADCB80067BAFC /* PBXTextBookmark */ = 61CEDC94116ADCB80067BAFC /* PBXTextBookmark */;
-			61CEDC95116ADCB80067BAFC /* PBXTextBookmark */ = 61CEDC95116ADCB80067BAFC /* PBXTextBookmark */;
-			61CEDCEB116ADFD70067BAFC /* PBXTextBookmark */ = 61CEDCEB116ADFD70067BAFC /* PBXTextBookmark */;
-			61CEDCEC116ADFD70067BAFC /* PBXTextBookmark */ = 61CEDCEC116ADFD70067BAFC /* PBXTextBookmark */;
-			61CEDD02116AE0D20067BAFC /* PBXTextBookmark */ = 61CEDD02116AE0D20067BAFC /* PBXTextBookmark */;
-			61CEDD03116AE0D20067BAFC /* PBXTextBookmark */ = 61CEDD03116AE0D20067BAFC /* PBXTextBookmark */;
-			61CEDD04116AE0D20067BAFC /* PBXTextBookmark */ = 61CEDD04116AE0D20067BAFC /* PBXTextBookmark */;
-			61E2F0811156B170002D33C1 /* PBXTextBookmark */ = 61E2F0811156B170002D33C1 /* PBXTextBookmark */;
+			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 */;
 		};
 		sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */;
 		userBuildSettings = {
@@ -188,6 +409,2197 @@
 			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}}";
+			sepNavSelRange = "{666, 0}";
+			sepNavVisRange = "{0, 809}";
+		};
+	};
+	611B0AA0116B626E00112153 /* GeneralSettingsViewController.m */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {663, 4615}}";
+			sepNavSelRange = "{8420, 0}";
+			sepNavVisRange = "{631, 75}";
+			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 */;
+		name = "SplitViewRootController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 3;
+		vrLoc = 0;
+	};
+	611B0AC7116B6E8B00112153 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
+		name = "DetailViewController.m: 33";
+		rLen = 5;
+		rLoc = 1542;
+		rType = 0;
+		vrLen = 27;
+		vrLoc = 7;
+	};
+	611B0AC8116B6E8B00112153 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 611B0A9F116B626E00112153 /* GeneralSettingsViewController.h */;
+		name = "GeneralSettingsViewController.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		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 */;
+		name = "MainMenuViewController.h: 10";
+		rLen = 0;
+		rLoc = 172;
+		rType = 0;
+		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 */;
+		name = "GameSetup.m: 84";
+		rLen = 0;
+		rLoc = 3164;
+		rType = 0;
+		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 */;
+		name = "GeneralSettingsViewController.m: 249";
+		rLen = 0;
+		rLoc = 8420;
+		rType = 0;
+		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 */;
@@ -482,9 +2894,9 @@
 	};
 	617987E7114AA34C00BA94A9 /* hwengine.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {537, 7839}}";
-			sepNavSelRange = "{806, 0}";
-			sepNavVisRange = "{791, 33}";
+			sepNavIntBoundsRect = "{{0, 0}, {838, 7787}}";
+			sepNavSelRange = "{7142, 0}";
+			sepNavVisRange = "{7692, 1318}";
 			sepNavWindowFrame = "{{421, 176}, {897, 692}}";
 		};
 	};
@@ -852,17 +3264,17 @@
 	};
 	6179886E114AA4D000BA94A9 /* MainMenuViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {716, 495}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 515}";
+			sepNavIntBoundsRect = "{{0, 0}, {544, 325}}";
+			sepNavSelRange = "{172, 0}";
+			sepNavVisRange = "{0, 439}";
 			sepNavWindowFrame = "{{852, 335}, {775, 623}}";
 		};
 	};
 	6179886F114AA4D000BA94A9 /* MainMenuViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {824, 2600}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{85, 62}";
+			sepNavIntBoundsRect = "{{0, 0}, {831, 2431}}";
+			sepNavSelRange = "{2555, 0}";
+			sepNavVisRange = "{2485, 1061}";
 			sepNavWindowFrame = "{{260, 136}, {1058, 792}}";
 		};
 	};
@@ -892,9 +3304,9 @@
 	};
 	61798888114AA4E600BA94A9 /* GameSetup.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1412, 4394}}";
-			sepNavSelRange = "{630, 0}";
-			sepNavVisRange = "{1406, 3258}";
+			sepNavIntBoundsRect = "{{0, 0}, {1412, 4524}}";
+			sepNavSelRange = "{7069, 0}";
+			sepNavVisRange = "{6660, 808}";
 			sepNavWindowFrame = "{{760, 256}, {1079, 870}}";
 		};
 	};
@@ -981,20 +3393,34 @@
 			sepNavWindowFrame = "{{84, 318}, {1058, 792}}";
 		};
 	};
+	61A11ABF1168D8B600359010 /* SplitViewRootController.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {483, 338}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 3}";
+		};
+	};
 	61A11AC01168D8B600359010 /* SplitViewRootController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {483, 1287}}";
-			sepNavSelRange = "{2604, 0}";
-			sepNavVisRange = "{0, 37}";
+			sepNavIntBoundsRect = "{{0, 0}, {943, 1131}}";
+			sepNavSelRange = "{2643, 0}";
+			sepNavVisRange = "{2158, 674}";
 			sepNavWindowFrame = "{{479, 242}, {1058, 792}}";
 		};
 	};
+	61A11AC71168DA9400359010 /* MasterViewController.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
+			sepNavSelRange = "{399, 0}";
+			sepNavVisRange = "{0, 583}";
+		};
+	};
 	61A11AC81168DA9400359010 /* MasterViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 1677}}";
-			sepNavSelRange = "{3389, 0}";
-			sepNavVisRange = "{2898, 1640}";
-			sepNavWindowFrame = "{{719, 139}, {1058, 792}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1048, 1872}}";
+			sepNavSelRange = "{260, 0}";
+			sepNavVisRange = "{3526, 1819}";
+			sepNavWindowFrame = "{{322, 221}, {1058, 792}}";
 		};
 	};
 	61A11ACE1168DB1B00359010 /* TeamSettingsViewController.m */ = {
@@ -1007,7 +3433,7 @@
 	};
 	61A11AD41168DB3700359010 /* DetailViewController.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {999, 641}}";
+			sepNavIntBoundsRect = "{{0, 0}, {999, 664}}";
 			sepNavSelRange = "{583, 0}";
 			sepNavVisRange = "{0, 642}";
 			sepNavWindowFrame = "{{734, 254}, {1058, 792}}";
@@ -1015,18 +3441,25 @@
 	};
 	61A11AD51168DB3700359010 /* DetailViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1069, 1950}}";
-			sepNavSelRange = "{1107, 5}";
-			sepNavVisRange = "{0, 34}";
-			sepNavWindowFrame = "{{734, 254}, {1058, 792}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1503, 1898}}";
+			sepNavSelRange = "{2421, 0}";
+			sepNavVisRange = "{1791, 1747}";
+			sepNavWindowFrame = "{{690, 271}, {1058, 792}}";
+		};
+	};
+	61A11ADF1168DC6E00359010 /* SingleTeamViewController.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {999, 641}}";
+			sepNavSelRange = "{523, 0}";
+			sepNavVisRange = "{0, 633}";
 		};
 	};
 	61A11AE01168DC6E00359010 /* SingleTeamViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {775, 2743}}";
-			sepNavSelRange = "{316, 0}";
-			sepNavVisRange = "{384, 26}";
-			sepNavWindowFrame = "{{222, 192}, {1058, 792}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1111, 2938}}";
+			sepNavSelRange = "{1907, 0}";
+			sepNavVisRange = "{661, 2155}";
+			sepNavWindowFrame = "{{530, 146}, {1058, 792}}";
 		};
 	};
 	61A11AE21168DC9400359010 /* HogHatViewController.h */ = {
@@ -1038,10 +3471,10 @@
 	};
 	61A11AE31168DC9400359010 /* HogHatViewController.m */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            l = DetailViewController;\n            r = \"{5353, 24}\";\n            s = 1;\n        },\n                {\n            l = DetailViewController;\n            r = \"{5404, 24}\";\n            s = 1;\n        },\n                {\n            l = \"Nib name\";\n            r = \"{5454, 12}\";\n            s = 1;\n        }\n    );\n    r = \"{0, 6263}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {1048, 2535}}";
-			sepNavSelRange = "{3743, 0}";
-			sepNavVisRange = "{3811, 868}";
+			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}}";
 		};
 	};
@@ -1279,10 +3712,10 @@
 	};
 	61CE250C115E749A0098C467 /* OverlayViewController.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {879, 4199}}";
-			sepNavSelRange = "{5098, 0}";
-			sepNavVisRange = "{4085, 2739}";
-			sepNavWindowFrame = "{{819, 136}, {938, 967}}";
+			sepNavIntBoundsRect = "{{0, 0}, {985, 4290}}";
+			sepNavSelRange = "{10415, 0}";
+			sepNavVisRange = "{9865, 644}";
+			sepNavWindowFrame = "{{690, 149}, {938, 967}}";
 		};
 	};
 	61CE2514115E74CC0098C467 /* PBXBookmark */ = {
@@ -1338,7 +3771,7 @@
 		fRef = 61A11AE01168DC6E00359010 /* SingleTeamViewController.m */;
 		name = "SingleTeamViewController.m: 13";
 		rLen = 0;
-		rLoc = 316;
+		rLoc = 325;
 		rType = 0;
 		vrLen = 26;
 		vrLoc = 384;
@@ -1348,7 +3781,7 @@
 		fRef = 61A11AE31168DC9400359010 /* HogHatViewController.m */;
 		name = "HogHatViewController.m: 114";
 		rLen = 0;
-		rLoc = 3701;
+		rLoc = 3700;
 		rType = 0;
 		vrLen = 30;
 		vrLoc = 0;
@@ -1418,7 +3851,7 @@
 		fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
 		name = "DetailViewController.m: 33";
 		rLen = 5;
-		rLoc = 1107;
+		rLoc = 1542;
 		rType = 0;
 		vrLen = 0;
 		vrLoc = 0;
@@ -1448,7 +3881,7 @@
 		fRef = 61A11AD51168DB3700359010 /* DetailViewController.m */;
 		name = "DetailViewController.m: 33";
 		rLen = 5;
-		rLoc = 1107;
+		rLoc = 1542;
 		rType = 0;
 		vrLen = 34;
 		vrLoc = 0;