Remove the iphone directory

39 files changed, 0 insertions, 7612 deletions

diff --git a/iphone/FixMyStreet/.gitignore b/iphone/FixMyStreet/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/iphone/FixMyStreet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/iphone/FixMyStreet/AboutView.xib b/iphone/FixMyStreet/AboutView.xib
deleted file mode 100644
index 2e5add074..000000000
--- a/iphone/FixMyStreet/AboutView.xib
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
-	<data>
-		<int key="IBDocument.SystemTarget">528</int>
-		<string key="IBDocument.SystemVersion">9L31a</string>
-		<string key="IBDocument.InterfaceBuilderVersion">677</string>
-		<string key="IBDocument.AppKitVersion">949.54</string>
-		<string key="IBDocument.HIToolboxVersion">353.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-			</object>
-			<object class="IBProxyObject" id="711762367">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIView" id="201743607">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBUIImageView" id="778263069">
-								<reference key="NSNextResponder" ref="201743607"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrameSize">{320, 80}</string>
-								<reference key="NSSuperview" ref="201743607"/>
-								<reference key="NSWindow"/>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-								<int key="IBUIContentMode">4</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<object class="NSCustomResource" key="IBUIImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">mysociety.png</string>
-								</object>
-							</object>
-						</object>
-						<string key="NSFrameSize">{341, 80}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="159075115">
-								<int key="NSID">2</int>
-							</object>
-						</object>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-					</object>
-					<object class="IBUILabel" id="151821449">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 108}, {280, 143}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MSAxIDEgMAA</bytes>
-						</object>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
-						<string type="base64-UTF8" key="IBUIText">Rml4TXlTdHJlZXQgZm9yIGlQaG9uZSB3YXMgd3JpdHRlbiBmb3IgbXlTb2NpZXR5IGJ5IE1hdHRoZXcg
-U29tZXJ2aWxsZS4gbXlTb2NpZXR5IGlzIHJ1biBieSBhIHJlZ2lzdGVyZWQgY2hhcml0eSDigJMgaWYg
-eW91IGxpa2UgdGhpcyBhcHBsaWNhdGlvbiwgcGxlYXNlIGRvbmF0ZSB0byB1cyBzbyB0aGF0IHdlIGNh
-biBidWlsZCBtb3JlIGNvb2wgYW5kIHVzZWZ1bCB0aGluZ3MgbGlrZSB0aGlzIGluIHRoZSBmdXR1cmUu
-A</string>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">Helvetica</string>
-							<double key="NSSize">1.700000e+01</double>
-							<int key="NSfFlags">16</int>
-						</object>
-						<object class="NSColor" key="IBUITextColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MCAwIDAAA</bytes>
-						</object>
-						<nil key="IBUIHighlightedColor"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">1.000000e+01</float>
-						<int key="IBUINumberOfLines">7</int>
-					</object>
-					<object class="IBUIButton" id="401248225">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{82, 296}, {156, 86}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">1.500000e+01</double>
-							<int key="NSfFlags">16</int>
-						</object>
-						<int key="IBUIButtonType">1</int>
-						<string key="IBUIHighlightedTitle">Donate</string>
-						<string key="IBUIDisabledTitle">Donate</string>
-						<string key="IBUISelectedTitle">Donate</string>
-						<string key="IBUINormalTitle">Donate</string>
-						<object class="NSColor" key="IBUIHighlightedTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MSAxIDEAA</bytes>
-						</object>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-						</object>
-						<object class="NSColor" key="IBUINormalTitleShadowColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MAA</bytes>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{320, 416}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<reference key="NSCustomColorSpace" ref="159075115"/>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
-					<bool key="IBUIPrompted">NO</bool>
-				</object>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">6</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">donate:</string>
-						<reference key="source" ref="401248225"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">8</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">donateButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="401248225"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="360949347">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="401248225"/>
-							<reference ref="151821449"/>
-							<reference ref="201743607"/>
-						</object>
-						<reference key="parent" ref="360949347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="360949347"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="711762367"/>
-						<reference key="parent" ref="360949347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3</int>
-						<reference key="object" ref="151821449"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="401248225"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="201743607"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="778263069"/>
-						</object>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="778263069"/>
-						<reference key="parent" ref="201743607"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.CustomClassName</string>
-					<string>-2.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>3.IBPluginDependency</string>
-					<string>4.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>7.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>AboutViewController</string>
-					<string>UIResponder</string>
-					<string>{{975, 228}, {320, 480}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">9</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AboutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">donate:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">donateButton</string>
-						<string key="NS.object.0">UIButton</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Classes/AboutViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">FixMyStreet.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">3.0</string>
-	</data>
-</archive>
diff --git a/iphone/FixMyStreet/Classes/AboutViewController.h b/iphone/FixMyStreet/Classes/AboutViewController.h
deleted file mode 100644
index 21922cd8b..000000000
--- a/iphone/FixMyStreet/Classes/AboutViewController.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  AboutViewController.h
-//  FixMyStreet
-//
-//  Created by Matthew on 23/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface AboutViewController : UIViewController {
-	IBOutlet UIButton* donateButton;
-}
-
--(IBAction)donate:(id)sender;
-
-@end
diff --git a/iphone/FixMyStreet/Classes/AboutViewController.m b/iphone/FixMyStreet/Classes/AboutViewController.m
deleted file mode 100644
index 8f6e8a228..000000000
--- a/iphone/FixMyStreet/Classes/AboutViewController.m
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  AboutViewController.m
-//  FixMyStreet
-//
-//  Created by Matthew on 23/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import "AboutViewController.h"
-
-@implementation AboutViewController
-
-/*
-// Override initWithNibName:bundle: to load the view using a nib file then perform additional customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-// Implement viewDidLoad to do additional setup after loading the view.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-	self.title = @"About";
-	self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
-	donateButton.titleLabel.font = [UIFont systemFontOfSize:32];
-}
-
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-
-- (void)dealloc {
-    [super dealloc];
-}
-
--(IBAction)donate:(id)sender {
-	[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://www.mysociety.org/donate/"]];  
-}
-
-@end
diff --git a/iphone/FixMyStreet/Classes/Default.png b/iphone/FixMyStreet/Classes/Default.png
deleted file mode 100644
index 10143f6ac..000000000
--- a/iphone/FixMyStreet/Classes/Default.png
+++ /dev/null
diff --git a/iphone/FixMyStreet/Classes/EditSubjectViewController.h b/iphone/FixMyStreet/Classes/EditSubjectViewController.h
deleted file mode 100644
index e998d0fee..000000000
--- a/iphone/FixMyStreet/Classes/EditSubjectViewController.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  EditSubjectViewController.h
-//  FixMyStreet
-//
-//  Created by Matthew on 01/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@class EditingTableViewCell;
-
-@interface EditSubjectViewController : UITableViewController <UITextFieldDelegate> {
-	EditingTableViewCell *cell;
-}
-
-@property (nonatomic, retain) EditingTableViewCell *cell;
-
--(void)setAll:(NSString*)a viewTitle:(NSString*)b placeholder:(NSString*)c keyboardType:(UIKeyboardType)d capitalisation:(UITextAutocapitalizationType)e;
--(void)updateText:(NSString*)text;
-
-@end
diff --git a/iphone/FixMyStreet/Classes/EditSubjectViewController.m b/iphone/FixMyStreet/Classes/EditSubjectViewController.m
deleted file mode 100644
index 614aa7f7b..000000000
--- a/iphone/FixMyStreet/Classes/EditSubjectViewController.m
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-//  EditSubjectViewController.m
-//  FixMyStreet
-//
-//  Created by Matthew on 01/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import "EditSubjectViewController.h"
-#import "EditingTableViewCell.h"
-#import "FixMyStreetAppDelegate.h"
-
-@implementation EditSubjectViewController
-
-@synthesize cell;
-
-/*
-- (id)initWithStyle:(UITableViewStyle)style {
-    // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-    if (self = [super initWithStyle:style]) {
-    }
-    return self;
-}
-*/
-
--(void)setAll:(NSString*)a viewTitle:(NSString*)b placeholder:(NSString*)c keyboardType:(UIKeyboardType)d capitalisation:(UITextAutocapitalizationType)e {
-	cell = [[EditingTableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:@"EditingCell"];
-	cell.textField.delegate = self;
-	cell.textField.placeholder = c;
-	self.title = b;
-	if (a) cell.textField.text = a;
-	cell.textField.keyboardType = d;
-	if (b == @"Edit name" || b == @"Edit email") {
-		cell.textField.autocorrectionType = UITextAutocorrectionTypeNo;
-	}
-	cell.textField.autocapitalizationType = e;
-}
-
-// Implement viewDidLoad to do additional setup after loading the view.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-	self.tableView.sectionHeaderHeight = 27.0;
-	self.tableView.sectionFooterHeight = 0.0;
-//	self.title = viewTitle;
-}
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-	if (cell.textField.placeholder == @"Subject") {
-		return 2;
-	}
-    return 1;
-}
-
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 1;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-	if (indexPath.section == 1) {
-		return 54.0;
-	}
-	return 44.0;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	if (indexPath.section == 1) {
-		static NSString *CellIdentifier = @"InfoCell";
-		UITableViewCell *infoCell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-		if (infoCell == nil) {
-			infoCell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease];
-			UITextView *blurb = [[UITextView alloc] initWithFrame:CGRectMake(10, 0, 280, 44)];
-			blurb.font = [UIFont italicSystemFontOfSize:14];
-			blurb.textAlignment = UITextAlignmentCenter;
-			blurb.editable = NO;
-			blurb.text = @"You can provide more details\nlater on at the website";
-			[infoCell.contentView addSubview:blurb];
-			[blurb release];
-		}
-		return infoCell;
-	}
-
-	return cell;
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	[tableView deselectRowAtIndexPath:indexPath animated:NO];
-	[cell.textField becomeFirstResponder];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    //[super viewWillAppear:animated];
-	[cell.textField becomeFirstResponder];
-}
-
-/*
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-}
-*/
-
-- (void)viewWillDisappear:(BOOL)animated {
-	// On 2.0 this produces same effect as clicking Done, but not in 2.1?
-	[cell.textField resignFirstResponder];
-}
-
-/*
-- (void)viewDidDisappear:(BOOL)animated {
-}
-*/
-/*
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-}
-*/
-
-- (void)dealloc {
-	[cell release];
-    [super dealloc];
-}
-
-
--(void)updateText:(NSString*)text {
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	// This is yucky, but I can't think of a better way that wouldn't just waste time.
-	NSString* placeholder = cell.textField.placeholder;
-	if (placeholder == @"Subject") {
-		if (text.length) {
-			delegate.subject = text;
-		} else {
-			delegate.subject = nil;
-		}
-	} else if (placeholder == @"Your name") {
-		if (text.length) {
-			delegate.name = text;
-		} else {
-			delegate.name = nil;
-		}
-	} else if (placeholder == @"Your email") {
-		if (text.length) {
-			delegate.email = text;
-		} else {
-			delegate.email = nil;
-		}
-	} else if (placeholder == @"Your phone number") {
-		if (text.length) {
-			delegate.phone = text;
-		} else {
-			delegate.phone = nil;
-		}
-	}
-	[self.navigationController popViewControllerAnimated:YES];
-}
-
--(BOOL)textFieldShouldReturn:(UITextField*)theTextField {
-	//if (theTextField == subjectTextField) {
-	[theTextField resignFirstResponder];
-	[self updateText:theTextField.text];
-	//}
-	return YES;
-}
-
-@end
-
diff --git a/iphone/FixMyStreet/Classes/EditingTableViewCell.h b/iphone/FixMyStreet/Classes/EditingTableViewCell.h
deleted file mode 100644
index 812968821..000000000
--- a/iphone/FixMyStreet/Classes/EditingTableViewCell.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  EditingTableViewCell.h
-//  FixMyStreet
-//
-//  Created by Matthew on 20/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface EditingTableViewCell : UITableViewCell {
-	UITextField *textField;
-}
-@property (nonatomic, retain) UITextField *textField;
-
-@end
diff --git a/iphone/FixMyStreet/Classes/EditingTableViewCell.m b/iphone/FixMyStreet/Classes/EditingTableViewCell.m
deleted file mode 100644
index 04f9b2fa0..000000000
--- a/iphone/FixMyStreet/Classes/EditingTableViewCell.m
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  EditingTableViewCell.m
-//  FixMyStreet
-//
-//  Created by Matthew on 20/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import "EditingTableViewCell.h"
-
-@implementation EditingTableViewCell
-
-@synthesize textField;
-
-- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
-    if (self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) {
-        textField = [[UITextField alloc] initWithFrame:CGRectZero];
-		textField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
-		textField.font = [UIFont systemFontOfSize:20];
-		textField.clearButtonMode = UITextFieldViewModeWhileEditing;
-		textField.returnKeyType = UIReturnKeyDone;
-		[self addSubview:textField];
-	}
-    return self;
-}
-
--(void)layoutSubviews {
-	textField.frame = CGRectInset(self.contentView.bounds, 20, 0);
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-    // Configure the view for the selected state
-}
-
-- (void)dealloc {
-	[textField release];
-    [super dealloc];
-}
-
-@end
diff --git a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h
deleted file mode 100644
index 048587695..000000000
--- a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  FixMyStreetAppDelegate.h
-//  FixMyStreet
-//
-//  Created by Matthew on 25/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@class InputTableViewController;
-
-@interface FixMyStreetAppDelegate : NSObject <UIApplicationDelegate> {
-    UIWindow *window;
-//	UIViewController *viewController;
-	UINavigationController *navigationController;
-
-	// The report currently being entered.
-	NSData* image;
-	
-	NSString* latitude;
-	NSString* longitude;
-	NSString* subject;
-
-	NSString* name;
-	NSString* email;
-	NSString* phone;
-	
-	UIView *uploading;
-	NSMutableData* returnData;
-}
-
-@property (nonatomic, retain) IBOutlet UIWindow *window;
-@property (nonatomic, retain) UINavigationController *navigationController;
-//@property (nonatomic, retain) IBOutlet UIViewController *viewController;
-
-@property (nonatomic, retain) NSData* image;
-@property (nonatomic, retain) NSString* latitude;
-@property (nonatomic, retain) NSString* longitude;
-@property (nonatomic, retain) NSString* subject;
-@property (nonatomic, retain) NSString* name;
-@property (nonatomic, retain) NSString* email;
-@property (nonatomic, retain) NSString* phone;
-
--(void)uploadReport;
-
-@end
-
diff --git a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m b/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m
deleted file mode 100644
index aa9b99bb5..000000000
--- a/iphone/FixMyStreet/Classes/FixMyStreetAppDelegate.m
+++ /dev/null
@@ -1,233 +0,0 @@
-//
-//  FixMyStreetAppDelegate.m
-//  FixMyStreet
-//
-//  Created by Matthew on 25/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import "FixMyStreetAppDelegate.h"
-#import "InputTableViewController.h"
-#import "Reachability.h"
-
-@implementation FixMyStreetAppDelegate
-
-@synthesize window, navigationController; //, viewController;
-@synthesize image, latitude, longitude, subject, name, email, phone;
-
-- (void)applicationDidFinishLaunching:(UIApplication *)application {
-	InputTableViewController *inputTableViewController = [[InputTableViewController alloc] initWithNibName:@"MainViewController" bundle:[NSBundle mainBundle]];
-//	InputTableViewController *inputTableViewController = [[InputTableViewController alloc] initWithStyle:UITableViewStyleGrouped];
-	//RootViewController *rootViewController = [[RootViewController alloc] i
-	// So we had our root view in a nib file, but we're creating our navigation controller programmatically. Ah well.
-	UINavigationController *aNavigationController = [[UINavigationController alloc] initWithRootViewController:inputTableViewController];
-//	UINavigationController *aNavigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
-	self.navigationController = aNavigationController;
-	[aNavigationController release];
-	[inputTableViewController release];
-//	[rootViewController release];
-
-	// NSMutableArray *tempMutableCopy = [[[NSUserDefaults standardUserDefaults] objectForKey:kRestoreLocationKey] mutableCopy];
-	name = [[NSUserDefaults standardUserDefaults] stringForKey:@"Name"];
-	email = [[NSUserDefaults standardUserDefaults] stringForKey:@"Email"];
-	phone = [[NSUserDefaults standardUserDefaults] stringForKey:@"Phone"];
-	subject = [[NSUserDefaults standardUserDefaults] stringForKey:@"Subject"];
-
-	image = [[NSUserDefaults standardUserDefaults] objectForKey:@"Image"];
-//	NSData *imageData = [[[NSUserDefaults standardUserDefaults] objectForKey:@"Image"] mutableCopy];
-//	if (imageData != nil)
-//		image = (UIImage *)[NSKeyedUnarchiver unarchiveObjectWithData:imageData];
-//	[imageData release];
-
-	latitude = [[NSUserDefaults standardUserDefaults] stringForKey:@"Latitude"];
-	longitude = [[NSUserDefaults standardUserDefaults] stringForKey:@"Longitude"];
-//	NSData *locationData = [[NSUserDefaults standardUserDefaults] objectForKey:@"Location"];
-//	if (locationData != nil)
-//		location = (CLLocation *)[NSUnarchiver unarchiveObjectWithData:locationData];
-//	[locationData release];
-
-	[window addSubview:[navigationController view]];
-	[window makeKeyAndVisible];
-
-//	NSArray *keys = [NSArray arrayWithObjects:@"Name", @"Email", @"Phone", nil];
-//	NSArray *values = [NSArray arrayWithObjects:name, email, phone, nil];
-//	NSDictionary *dictionary = [NSDictionary dictionaryWithObjects:values forKeys:keys];
-//	[[NSUserDefaults standardUserDefaults] registerDefaults:dictionary];
-//	[[NSUserDefaults standardUserDefaults] synchronize];
-//	[keys release];
-//	[values release];
-//	[dictionary release];
-}
-
-- (void)dealloc {
-    [window release];
-	[navigationController release];
-//	[viewController release];
-	[image release];
-	[latitude release];
-	[longitude release];
-	[subject release];
-	[name release];
-	[email release];
-	[phone release];
-    [super dealloc];
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application {
-	// Save state in case they're just in the middle of a phone call...
-	[[NSUserDefaults standardUserDefaults] setObject:name forKey:@"Name"];
-	[[NSUserDefaults standardUserDefaults] setObject:email forKey:@"Email"];
-	[[NSUserDefaults standardUserDefaults] setObject:phone forKey:@"Phone"];
-	[[NSUserDefaults standardUserDefaults] setObject:subject forKey:@"Subject"];
-
-// XXX image crashes (restarting app. still has image showing?! and then quitting crashes, either way)
-// Location just doesn't seem to work
-	
-//	if (image) {
-//		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-//		NSString *imageFile = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"saved.image"];
-//		[NSKeyedArchiver archiveRootObject:image toFile:imageFile];
-//	}
-//	NSData *imageData = [NSKeyedArchiver archivedDataWithRootObject:image];
-//	[[NSUserDefaults standardUserDefaults] setObject:imageData forKey:@"Image"];
-//	[imageData release];
-	[[NSUserDefaults standardUserDefaults] setObject:image forKey:@"Image"];
-
-	[[NSUserDefaults standardUserDefaults] setObject:latitude forKey:@"Latitude"];
-	[[NSUserDefaults standardUserDefaults] setObject:longitude forKey:@"Longitude"];
-//	NSData *locationData = [NSKeyedArchiver archivedDataWithRootObject:location];
-//	[[NSUserDefaults standardUserDefaults] setObject:locationData forKey:@"Location"];
-//	[locationData release];
-	
-	[[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-// Report stuff
--(void)uploadReport {
-	// Check internet connection status
-	NetworkStatus internetConnectionStatus	= [[Reachability sharedReachability] internetConnectionStatus];
-    if (internetConnectionStatus == NotReachable) {
-		UIAlertView *v = [[UIAlertView alloc] initWithTitle:@"Reporting failed" message:@"You need to be connected to the internet to report a problem." delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
-		[v show];
-		[v release];		
-		return;
-    }
-
-	[[MyCLController sharedInstance] stopUpdatingLocation];
-	[UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
-
-	uploading = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 320, 480)];
-	UIColor *bg = [[UIColor alloc] initWithRed:0 green:0 blue:0 alpha:0.5];
-	uploading.backgroundColor = bg;
-	[bg release];
-	UIActivityIndicatorView *spinny = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
-	spinny.center = CGPointMake(160, 160);
-	[uploading addSubview:spinny];
-	[spinny startAnimating];
-	[self.navigationController.view addSubview:uploading];
-	[spinny release];
-	
-	// Get the phone's unique ID
-	UIDevice *dev = [UIDevice currentDevice];
-	NSString *uniqueId = dev.uniqueIdentifier;
-	
-	NSString *urlString = @"http://matthew.fixmystreet.com/import";
-	NSMutableURLRequest *request = [[[NSMutableURLRequest alloc] init] autorelease];
-	[request setURL:[NSURL URLWithString: urlString]];
-	[request setHTTPMethod: @"POST"];
-	
-	NSString *stringBoundary = @"0xMyLovelyBoundary";
-	NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@",stringBoundary];
-	[request addValue:contentType forHTTPHeaderField: @"Content-Type"];
-	
-	//setting up the body:
-	NSMutableData *postBody = [NSMutableData data];
-	
-	[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"service\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[@"iPhone" dataUsingEncoding:NSASCIIStringEncoding]];
-	
-	[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"phone_id\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[uniqueId dataUsingEncoding:NSASCIIStringEncoding]];
-	
-	[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"subject\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[subject dataUsingEncoding:NSASCIIStringEncoding]];
-
-	[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"name\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[name dataUsingEncoding:NSASCIIStringEncoding]];
-	
-	[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"email\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[email dataUsingEncoding:NSASCIIStringEncoding]];
-	
-	[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"phone\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-	[postBody appendData:[phone dataUsingEncoding:NSASCIIStringEncoding]];
-	
-	if (latitude) {
-//		NSString* latitude = [NSString stringWithFormat:@"%f", location.coordinates.latitude];
-//		NSString* longitude = [NSString stringWithFormat:@"%f", location.coordinates.longitude];
-		[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"lat\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:[latitude dataUsingEncoding:NSASCIIStringEncoding]];
-	
-		[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"lon\"\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:[longitude dataUsingEncoding:NSASCIIStringEncoding]];
-	}
-
-	if (image) {
-//		NSData *imageData  = UIImageJPEGRepresentation(image, 0.8);	
-		[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:[[NSString stringWithString:@"Content-Disposition: form-data; name=\"photo\"; filename=\"from_phone.jpeg\"\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:[[NSString stringWithString:@"Content-Type: image/jpeg\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:[[NSString stringWithString:@"Content-Transfer-Encoding: binary\r\n\r\n"] dataUsingEncoding:NSASCIIStringEncoding]];
-		[postBody appendData:image];
-	}
-
-	[postBody appendData:[[NSString stringWithFormat:@"\r\n--%@--\r\n",stringBoundary] dataUsingEncoding:NSASCIIStringEncoding]];
-	
-	[request setHTTPBody: postBody];
-	
-	returnData = [[NSMutableData alloc] init];
-	[NSURLConnection connectionWithRequest:request delegate:self];
-//	NSData *returnData = [NSURLConnection sendSynchronousRequest:request returningResponse:nil error:nil];
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-	[returnData appendData:data];
-}
-
--(void)connectionDidFinishLoading:(NSURLConnection *)connection {
-	[UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
-	[uploading removeFromSuperview];
-
-	NSString *returnString = [[NSString alloc] initWithData:returnData encoding:NSASCIIStringEncoding];
-
-	if ([returnString isEqualToString:@"SUCCESS"]) {
-		subject = nil;
-		latitude = nil;
-		longitude = nil;
-		self.image = nil;
-		[(InputTableViewController*)self.navigationController.visibleViewController reportUploaded:YES];
-		UIAlertView *v = [[UIAlertView alloc] initWithTitle:@"Your report has been received" message:@"Check your email for the next step" delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
-		[v show];
-		[v release];
-	} else {
-		// Pop up alert box with return error(s)
-		NSArray *errors = [returnString componentsSeparatedByString:@"ERROR:"];
-		NSString *errorString = [[NSString alloc] init];
-		for (int i=1; i<[errors count]; i++) {
-			NSString *error = [errors objectAtIndex:i];
-			errorString = [errorString stringByAppendingFormat:@"\xE2\x80\xA2 %@", error];
-		}
-		UIAlertView *v = [[UIAlertView alloc] initWithTitle:@"Upload failed" message:errorString delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
-		[v show];
-		[v release];
-	}
-}
-
-@end
diff --git a/iphone/FixMyStreet/Classes/InputTableViewController.h b/iphone/FixMyStreet/Classes/InputTableViewController.h
deleted file mode 100644
index f902c4017..000000000
--- a/iphone/FixMyStreet/Classes/InputTableViewController.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  InputTableViewController.h
-//  FixMyStreet
-//
-//  Created by Matthew on 26/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "MyCLController.h"
-
-@interface InputTableViewController : UIViewController <UINavigationControllerDelegate,UIImagePickerControllerDelegate,MyCLControllerDelegate> {
-	IBOutlet UIImageView* imageView;
-	IBOutlet UITableView* actionsToDoView;
-	IBOutlet UIButton* settingsButton;
-	UIBarButtonItem* backButton;
-
-	// Not sure what I made these for
-	UITableViewCell* actionTakePhotoCell;
-	UITableViewCell* actionFetchLocationCell;
-	UITableViewCell* actionSubjectCell;
-	
-	UILabel* subjectLabel;
-	UILabel* subjectContent;
-}
-
--(void)enableSubmissionButton;
--(void)uploadReport;
--(void)reportUploaded:(BOOL)success;
-
--(IBAction)addPhoto:(id) sender;
--(IBAction)gotoSettings:(id)sender firstTime:(BOOL)firstTime;
--(IBAction)gotoAbout:(id)sender;
-
-// UIImagePickerControllerDelegate
-- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingImage:(UIImage *)image editingInfo:(NSDictionary *)editingInfo;
-- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
-
--(BOOL)startLocation;
-
-//MyCLControllerDelegate
--(void)newLocationUpdate:(CLLocation *)location;
--(void)newLocationError:(NSString *)text;
-
-@end
diff --git a/iphone/FixMyStreet/Classes/InputTableViewController.m b/iphone/FixMyStreet/Classes/InputTableViewController.m
deleted file mode 100644
index 7d336e115..000000000
--- a/iphone/FixMyStreet/Classes/InputTableViewController.m
+++ /dev/null
@@ -1,359 +0,0 @@
-//
-//  InputTableViewController.m
-//  FixMyStreet
-//
-//  Created by Matthew on 26/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import "InputTableViewController.h"
-#import "SettingsViewController.h"
-#import "FixMyStreetAppDelegate.h"
-#import "EditSubjectViewController.h"
-#import "AboutViewController.h"
-#import "Reachability.h"
-
-@implementation InputTableViewController
-
-//@synthesize image;
-//@synthesize imagCell;
-//@synthesize reportSubject;
-
-- (id)initWithNibName:(NSString *)nibName bundle:(NSBundle *)nibBundle {
-    if (self = [super initWithNibName:nibName bundle:nibBundle]) {
-		self.title = @"FixMyStreet";
-	}
-	return self;
-}
-
-/*
-- (id)initWithStyle:(UITableViewStyle)style {
-    // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-    if (self = [super initWithStyle:style]) {
-    }
-    return self;
-}
-*/
-
-- (void)viewWillAppear:(BOOL)animated {
-	[self enableSubmissionButton];
-}
-
-// Implement viewDidLoad to do additional setup after loading the view.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-	settingsButton.frame = CGRectMake(255, 350, 72, 73);
-
-	backButton = [[UIBarButtonItem alloc] initWithTitle:@"Cancel" style:UIBarButtonSystemItemCancel target:nil action:nil];
-	self.navigationItem.backBarButtonItem = backButton;
-
-	UIBarButtonItem* rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Report" style:UIBarButtonItemStyleDone target:self action:@selector(uploadReport) ];
-	rightBarButtonItem.enabled = NO;
-	self.navigationItem.rightBarButtonItem = rightBarButtonItem;
-	[rightBarButtonItem release];
-
-	// Let's start trying to find our location...
-	[MyCLController sharedInstance].delegate = self;
-	[self startLocation];
-
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	if (delegate.image) {
-		UIImage *newImage = [[UIImage alloc] initWithData:delegate.image];
-		imageView.image = newImage;
-		[newImage release];
-	}
-
-}
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	if (delegate.name || delegate.email || delegate.phone)
-		return 4;
-	return 3;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-	return 1;
-}
-
--(void)enableSubmissionButton {
-	[actionsToDoView reloadData];
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	if (delegate.image && delegate.latitude && delegate.subject && delegate.subject.length) {
-		self.navigationItem.rightBarButtonItem.enabled = YES;
-	} else {
-		self.navigationItem.rightBarButtonItem.enabled = NO;
-	}
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-
-	static NSString *CellIdentifier;
-	UITableViewCell *cell;
-	FixMyStreetAppDelegate* delegate = [[UIApplication sharedApplication] delegate];
-	
-	// Possible editing of subject within main view (I think I prefer it as is)
-	// And possible display of selected image within cell somewhere/somehow (I like how Contacts does it, but haven't
-	// managed that so far
-
-	if (indexPath.section == 1) {
-		CellIdentifier = @"CellText";
-		cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-		if (cell == nil) {
-			//CGRect frame = CGRectMake(0, 0, 250, 44);
-			cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease];
-			//cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-			//UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(1.0, 1.0, 250, 44)];
-			//textField.placeholder = @"Subject";
-			// [textField addTarget:self action:nil forControlEvents:UIControlEventValueChanged];
-			//cell.accessoryView = textField;
-			//[textField release];
-		}
-	} else {
-	/* if (indexPath.section == 0) {
-		CellIdentifier = @"CellImage";
-		cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-		if (cell == nil) {
-			cell = [[[imageCell alloc] initWithFrame:CGRectMake(0, 0, 400, 44) reuseIdentifier:CellIdentifier] autorelease];
-			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-		}
-	} else { */
-
-		CellIdentifier = @"Cell";
-		cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-		if (cell == nil) {
-			cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease];
-			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-		}
-	
-	}
-
-	if (indexPath.section == 0) {
-		if (delegate.image) {
-			cell.accessoryType = UITableViewCellAccessoryCheckmark;
-		} else {
-			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-		}
-		cell.textLabel.text = @"Take photo";
-		actionTakePhotoCell = cell;
-	} else if (indexPath.section == 2) {
-		if (delegate.latitude) {
-			cell.accessoryView = nil;
-			cell.accessoryType = UITableViewCellAccessoryCheckmark;
-		} else if ([MyCLController sharedInstance].updating) {
-			UIActivityIndicatorView* activityView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
-			[activityView startAnimating];
-			cell.accessoryView = activityView;
-			[activityView release];
-		} else {
-			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-		}
-		cell.textLabel.text = @"Fetch location";
-		actionFetchLocationCell = cell;
-	} else if (indexPath.section == 1) {
-		if (delegate.subject && delegate.subject.length) {
-			if (!subjectLabel) {
-				subjectLabel = [[UILabel alloc] initWithFrame:CGRectMake(10,0,70,40)];
-				subjectLabel.font = [UIFont boldSystemFontOfSize:17];
-				subjectLabel.text = @"Subject:";
-				[cell.contentView addSubview:subjectLabel];
-			}
-			subjectLabel.hidden = NO;
-			if (!subjectContent) {
-				subjectContent = [[UILabel alloc] initWithFrame:CGRectMake(80,0,190,40)];
-				subjectContent.font = [UIFont systemFontOfSize:17];
-				[cell.contentView addSubview:subjectContent];
-			}
-			cell.textLabel.text = nil;
-			subjectContent.text = delegate.subject;
-			subjectContent.hidden = NO;
-			cell.accessoryType = UITableViewCellAccessoryCheckmark;
-		} else {
-			subjectContent.hidden = YES;
-			subjectLabel.hidden = YES;
-			cell.textLabel.text = @"Short summary of problem";
-			cell.textLabel.textColor = [UIColor grayColor];
-			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-		}
-		actionSubjectCell = cell;
-	} else if (indexPath.section == 3) {
-		if (delegate.name && delegate.name.length && delegate.email && delegate.email.length) {
-			cell.accessoryType = UITableViewCellAccessoryCheckmark;
-		} else {
-			cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-		}
-		cell.textLabel.text = @"Your details";
-	} else {
-		cell.textLabel.text = @"Eh?";
-	}
-	return cell;
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	[tableView deselectRowAtIndexPath:indexPath animated:YES];
-	if (indexPath.section == 0) {
-		[self addPhoto:nil];	
-	} else if (indexPath.section == 2) {
-		if ([self startLocation]) {
-			UIActivityIndicatorView* activityView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
-			[activityView startAnimating];
-			actionFetchLocationCell.accessoryView = activityView;
-			[activityView release];
-		}
-	} else if (indexPath.section == 1) {
-		FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-		EditSubjectViewController* editSubjectViewController = [[EditSubjectViewController alloc] initWithNibName:@"EditSubjectView" bundle:nil];
-		[editSubjectViewController setAll:delegate.subject viewTitle:@"Edit subject" placeholder:@"Subject" keyboardType:UIKeyboardTypeDefault capitalisation:UITextAutocapitalizationTypeSentences];
-		[self.navigationController pushViewController:editSubjectViewController animated:YES];
-		[editSubjectViewController release];
-	} else if (indexPath.section == 3) {
-		[self gotoSettings:nil firstTime:NO];
-	}
-}
-
--(IBAction)addPhoto:(id) sender {
-	BOOL cameraAvailable = [UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera];
-	BOOL photosAvailable = [UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary];
-	if (!cameraAvailable && !photosAvailable) {
-		UITableViewCell *cell = [actionsToDoView cellForRowAtIndexPath:0]; // XXX
-		cell.textLabel.text = @"No photo mechanism available";
-		return;
-	}
-	UIImagePickerController* picker = [[UIImagePickerController alloc] init];
-	if (cameraAvailable) {
-		picker.sourceType = UIImagePickerControllerSourceTypeCamera;
-	} else {
-		picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
-	}
-	picker.delegate = self;
-	picker.allowsImageEditing = NO;
-	[self presentModalViewController:picker animated:YES];
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-	backButton.title = @"Cancel";
-}
-
-/*
-- (void)viewWillDisappear:(BOOL)animated {
-}
-*/
-/*
-- (void)viewDidDisappear:(BOOL)animated {
-}
-*/
-/*
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-}
-*/
-
-// Check this, I can't remember if you need to release nib things.
-- (void)dealloc {
-	[imageView release];
-	[actionTakePhotoCell release];
-	[actionFetchLocationCell release];
-	[actionSubjectCell release];
-	[actionsToDoView release];
-	[settingsButton release];
-	[backButton release];
-	[subjectLabel release];
-	[subjectContent release];
-    [super dealloc];
-}
-
-
-// UIImagePickerControllerDelegate prototype
-
-- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingImage:(UIImage *)newImage editingInfo:(NSDictionary *)editingInfo {
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	NSData *imageData  = UIImageJPEGRepresentation(newImage, 0.8);	
-	delegate.image = imageData;
-
-	imageView.image = newImage;
-	
-	[[picker parentViewController] dismissModalViewControllerAnimated:YES];
-	[picker release];
-}
-
-- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
-	[[picker parentViewController] dismissModalViewControllerAnimated:YES];
-	[picker release];
-}
-
-// MyCLControllerDelegate and related
-
--(BOOL)startLocation {
-	NetworkStatus internetConnectionStatus	= [[Reachability sharedReachability] internetConnectionStatus];
-	if (internetConnectionStatus == NotReachable) {
-		UIAlertView *v = [[UIAlertView alloc] initWithTitle:@"Location required" message:@"FixMyStreet needs some sort of connection in order to find your location." delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
-		[v show];
-		[v release];
-		return FALSE;
-	} else {
-		[[MyCLController sharedInstance] startUpdatingLocation];
-		return TRUE;
-	}
-}
-
--(void)newLocationUpdate:(CLLocation *)location {
-	//UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Hey" message:text delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
-	//[alert show];
-	//[alert release];
-
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-//	delegate.location = location;
-	delegate.latitude = [NSString stringWithFormat:@"%f", location.coordinate.latitude];
-	delegate.longitude = [NSString stringWithFormat:@"%f", location.coordinate.longitude];
-
-	[self enableSubmissionButton];
-}
-
--(void)newLocationError:(NSString *)text {
-	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Location required" message:text delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
-	[alert show];
-	[alert release];
-	[self enableSubmissionButton];
-}
-
-// Buttons
-
-// I realise this flips the navbar too, but can't seem to do it nicely with a container parent, and not really that important!
--(IBAction)gotoAbout:(id)sender {
-	backButton.title = @"Back";
-	AboutViewController* aboutViewController = [[AboutViewController alloc] initWithNibName:@"AboutView" bundle:nil];
-	[UIView beginAnimations:nil context:NULL];
-	[UIView setAnimationDuration: 0.75];
-	[UIView setAnimationTransition:UIViewAnimationTransitionFlipFromRight forView:self.navigationController.view cache:YES];
-	[self.navigationController pushViewController:aboutViewController animated:NO];
-	[UIView commitAnimations];
-	[aboutViewController release];
-}
-
--(IBAction)gotoSettings:(id)sender firstTime:(BOOL)firstTime {
-	backButton.title = @"Done";
-	SettingsViewController* settingsViewController = [[SettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
-	if (firstTime)
-		settingsViewController.firstTime = firstTime; 
-	[self.navigationController pushViewController:settingsViewController animated:YES];
-	[settingsViewController release];
-}
-
--(void)uploadReport {
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	if (!delegate.name || !delegate.email) {
-		[self gotoSettings:nil firstTime:YES];
-	} else {
-		[delegate uploadReport];
-	}
-}
-
--(void)reportUploaded:(BOOL)success {
-	if (success)
-		imageView.image = nil;
-	[self enableSubmissionButton];	
-}
-
-@end
-
diff --git a/iphone/FixMyStreet/Classes/Reachability.h b/iphone/FixMyStreet/Classes/Reachability.h
deleted file mode 100755
index 18beaea3e..000000000
--- a/iphone/FixMyStreet/Classes/Reachability.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-
-File: Reachability.h
-Abstract: SystemConfiguration framework wrapper.
-
-Version: 1.5
-
-Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc.
-("Apple") in consideration of your agreement to the following terms, and your
-use, installation, modification or redistribution of this Apple software
-constitutes acceptance of these terms.  If you do not agree with these terms,
-please do not use, install, modify or redistribute this Apple software.
-
-In consideration of your agreement to abide by the following terms, and subject
-to these terms, Apple grants you a personal, non-exclusive license, under
-Apple's copyrights in this original Apple software (the "Apple Software"), to
-use, reproduce, modify and redistribute the Apple Software, with or without
-modifications, in source and/or binary forms; provided that if you redistribute
-the Apple Software in its entirety and without modifications, you must retain
-this notice and the following text and disclaimers in all such redistributions
-of the Apple Software.
-Neither the name, trademarks, service marks or logos of Apple Inc. may be used
-to endorse or promote products derived from the Apple Software without specific
-prior written permission from Apple.  Except as expressly stated in this notice,
-no other rights or licenses, express or implied, are granted by Apple herein,
-including but not limited to any patent rights that may be infringed by your
-derivative works or by other works in which the Apple Software may be
-incorporated.
-
-The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
-WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
-WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
-COMBINATION WITH YOUR PRODUCTS.
-
-IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
-DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
-CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (C) 2008 Apple Inc. All Rights Reserved.
-
-*/
-
-#import <UIKit/UIKit.h>
-#import <SystemConfiguration/SystemConfiguration.h>
-
-@class Reachability;
-
-@interface Reachability : NSObject {
-    
-@private
-	BOOL _networkStatusNotificationsEnabled;
-	
-	NSString *_hostName;
-	NSString *_address;
-    
-	NSMutableDictionary *_reachabilityQueries;
-}
-
-/*
- An enumeration that defines the return values of the network state
- of the device.
- */
-typedef enum {
-	NotReachable = 0,
-	ReachableViaCarrierDataNetwork,
-	ReachableViaWiFiNetwork
-} NetworkStatus;
-
-
-// Set to YES to register for changes in network status. Otherwise reachability queries
-// will be handled synchronously.
-@property BOOL networkStatusNotificationsEnabled;
-// The remote host whose reachability will be queried.
-// Either this or 'addressName' must be set.
-@property (nonatomic, retain) NSString *hostName;
-// The IP address of the remote host whose reachability will be queried.
-// Either this or 'hostName' must be set.
-@property (nonatomic, retain) NSString *address;
-// A cache of ReachabilityQuery objects, which encapsulate a SCNetworkReachabilityRef, a host or address, and a run loop. The keys are host names or addresses.
-@property (nonatomic, assign) NSMutableDictionary *reachabilityQueries;
-
-// This class is intended to be used as a singleton.
-+ (Reachability *)sharedReachability;
-
-// Is self.hostName is not nil, determines its reachability.
-// If self.hostName is nil and self.address is not nil, determines the reachability of self.address.
-- (NetworkStatus)remoteHostStatus;
-// Is the device able to communicate with Internet hosts? If so, through which network interface?
-- (NetworkStatus)internetConnectionStatus;
-// Is the device able to communicate with hosts on the local WiFi network? (Typically these are Bonjour hosts).
-- (NetworkStatus)localWiFiConnectionStatus;
-
-/*
- When reachability change notifications are posted, the callback method 'ReachabilityCallback' is called
- and posts a notification that the client application can observe to learn about changes.
- */
-static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info);
-
-@end
-
-@interface ReachabilityQuery : NSObject
-{
-@private
-	SCNetworkReachabilityRef _reachabilityRef;
-	CFMutableArrayRef _runLoops;
-	NSString *_hostNameOrAddress;
-}
-// Keep around each network reachability query object so that we can
-// register for updates from those objects.
-@property (nonatomic) SCNetworkReachabilityRef reachabilityRef;
-@property (nonatomic, retain) NSString *hostNameOrAddress;
-@property (nonatomic) CFMutableArrayRef runLoops;
-
-- (void)scheduleOnRunLoop:(NSRunLoop *)inRunLoop;
-
-@end
-
diff --git a/iphone/FixMyStreet/Classes/Reachability.m b/iphone/FixMyStreet/Classes/Reachability.m
deleted file mode 100755
index c1f159c55..000000000
--- a/iphone/FixMyStreet/Classes/Reachability.m
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
-
-File: Reachability.m
-Abstract: SystemConfiguration framework wrapper.
-
-Version: 1.5
-
-Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc.
-("Apple") in consideration of your agreement to the following terms, and your
-use, installation, modification or redistribution of this Apple software
-constitutes acceptance of these terms.  If you do not agree with these terms,
-please do not use, install, modify or redistribute this Apple software.
-
-In consideration of your agreement to abide by the following terms, and subject
-to these terms, Apple grants you a personal, non-exclusive license, under
-Apple's copyrights in this original Apple software (the "Apple Software"), to
-use, reproduce, modify and redistribute the Apple Software, with or without
-modifications, in source and/or binary forms; provided that if you redistribute
-the Apple Software in its entirety and without modifications, you must retain
-this notice and the following text and disclaimers in all such redistributions
-of the Apple Software.
-Neither the name, trademarks, service marks or logos of Apple Inc. may be used
-to endorse or promote products derived from the Apple Software without specific
-prior written permission from Apple.  Except as expressly stated in this notice,
-no other rights or licenses, express or implied, are granted by Apple herein,
-including but not limited to any patent rights that may be infringed by your
-derivative works or by other works in which the Apple Software may be
-incorporated.
-
-The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
-WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
-WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
-COMBINATION WITH YOUR PRODUCTS.
-
-IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
-DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
-CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (C) 2008 Apple Inc. All Rights Reserved.
-
-*/
-
-#import <sys/socket.h>
-#import <netinet/in.h>
-#import <netinet6/in6.h>
-#import <arpa/inet.h>
-#import <ifaddrs.h>
-#include <netdb.h>
-
-#import "Reachability.h"
-#import <SystemConfiguration/SCNetworkReachability.h>
-
-static NSString *kLinkLocalAddressKey = @"169.254.0.0";
-static NSString *kDefaultRouteKey = @"0.0.0.0";
-
-static Reachability *_sharedReachability;
-
-// A class extension that declares internal methods for this class.
-@interface Reachability()
-- (BOOL)isAdHocWiFiNetworkAvailableFlags:(SCNetworkReachabilityFlags *)outFlags;
-- (BOOL)isNetworkAvailableFlags:(SCNetworkReachabilityFlags *)outFlags;
-- (BOOL)isReachableWithoutRequiringConnection:(SCNetworkReachabilityFlags)flags;
-- (SCNetworkReachabilityRef)reachabilityRefForHostName:(NSString *)hostName;
-- (SCNetworkReachabilityRef)reachabilityRefForAddress:(NSString *)address;
-- (BOOL)addressFromString:(NSString *)IPAddress address:(struct sockaddr_in *)outAddress;
-- (void)stopListeningForReachabilityChanges;
-@end
-
-@implementation Reachability
-
-@synthesize networkStatusNotificationsEnabled = _networkStatusNotificationsEnabled;
-@synthesize hostName = _hostName;
-@synthesize address = _address;
-@synthesize reachabilityQueries = _reachabilityQueries;
-
-+ (Reachability *)sharedReachability
-{
-	if (!_sharedReachability) {
-		_sharedReachability = [[Reachability alloc] init];
-		// Clients of Reachability will typically call [[Reachability sharedReachability] setHostName:]
-		// before calling one of the status methods.
-        _sharedReachability.hostName = nil;
-		_sharedReachability.address = nil;
-		_sharedReachability.networkStatusNotificationsEnabled = NO;
-		_sharedReachability.reachabilityQueries = [[NSMutableDictionary alloc] init];
-	}
-	return _sharedReachability;
-}
-
-- (void) dealloc
-{	
-    [self stopListeningForReachabilityChanges];
-    
-	[_sharedReachability.reachabilityQueries release];
-	[_sharedReachability release];
-	[super dealloc];
-}
-
-- (BOOL)isReachableWithoutRequiringConnection:(SCNetworkReachabilityFlags)flags
-{
-    // kSCNetworkReachabilityFlagsReachable indicates that the specified nodename or address can
-	// be reached using the current network configuration.
-	BOOL isReachable = flags & kSCNetworkReachabilityFlagsReachable;
-	
-	// This flag indicates that the specified nodename or address can
-	// be reached using the current network configuration, but a
-	// connection must first be established.
-	//
-	// If the flag is false, we don't have a connection. But because CFNetwork
-    // automatically attempts to bring up a WWAN connection, if the WWAN reachability
-    // flag is present, a connection is not required.
-	BOOL noConnectionRequired = !(flags & kSCNetworkReachabilityFlagsConnectionRequired);
-	if ((flags & kSCNetworkReachabilityFlagsIsWWAN)) {
-		noConnectionRequired = YES;
-	}
-	
-	return (isReachable && noConnectionRequired) ? YES : NO;
-}
-
-// Returns whether or not the current host name is reachable with the current network configuration.
-- (BOOL)isHostReachable:(NSString *)host
-{
-    if (!host || ![host length]) {
-        return NO;
-    }
-    
-    SCNetworkReachabilityFlags		flags;
-    SCNetworkReachabilityRef reachability =  SCNetworkReachabilityCreateWithName(NULL, [host UTF8String]);
-	BOOL gotFlags = SCNetworkReachabilityGetFlags(reachability, &flags);
-    
-	CFRelease(reachability);
-    
-    if (!gotFlags) {
-        return NO;
-    }
-    
-	return [self isReachableWithoutRequiringConnection:flags];
-}
-
-// This returns YES if the address 169.254.0.0 is reachable without requiring a connection.
-- (BOOL)isAdHocWiFiNetworkAvailableFlags:(SCNetworkReachabilityFlags *)outFlags
-{		
-    // Look in the cache of reachability queries for one that matches this query.
-	ReachabilityQuery *query = [self.reachabilityQueries objectForKey:kLinkLocalAddressKey];
-	SCNetworkReachabilityRef adHocWiFiNetworkReachability = query.reachabilityRef;
-	
-    // If a cached reachability query was not found, create one.
-    if (!adHocWiFiNetworkReachability) {
-        
-        // Build a sockaddr_in that we can pass to the address reachability query.
-        struct sockaddr_in sin;
-        
-        bzero(&sin, sizeof(sin));
-        sin.sin_len = sizeof(sin);
-        sin.sin_family = AF_INET;
-        // IN_LINKLOCALNETNUM is defined in <netinet/in.h> as 169.254.0.0
-        sin.sin_addr.s_addr = htonl(IN_LINKLOCALNETNUM);
-        
-        adHocWiFiNetworkReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&sin);
-		
-		query = [[[ReachabilityQuery alloc] init] autorelease];
-		query.hostNameOrAddress = kLinkLocalAddressKey;
-		query.reachabilityRef = adHocWiFiNetworkReachability;
-		
-        // Add the reachability query to the cache.
-		[self.reachabilityQueries setObject:query forKey:kLinkLocalAddressKey];
-    }
-	
-	// If necessary, register for notifcations for the SCNetworkReachabilityRef on the current run loop.
-	// If an existing SCNetworkReachabilityRef was found in the cache, we can reuse it and register
-	// to receive notifications from it in the current run loop, which may be different than the run loop
-	// that was previously used when registering the SCNetworkReachabilityRef for notifications.
-    // -scheduleOnRunLoop: will schedule only if network status notifications are enabled in the Reachability instance.
-    // By default, they are not enabled. 
-	[query scheduleOnRunLoop:[NSRunLoop currentRunLoop]];
-    
-    SCNetworkReachabilityFlags addressReachabilityFlags;
-    BOOL gotFlags = SCNetworkReachabilityGetFlags(adHocWiFiNetworkReachability, &addressReachabilityFlags);
-    if (!gotFlags) {
-        // There was an error getting the reachability flags.
-        return NO;
-    }
-    
-    // Callers of this method might want to use the reachability flags, so if an 'out' parameter
-    // was passed in, assign the reachability flags to it.
-    if (outFlags) {
-        *outFlags = addressReachabilityFlags;
-    }
-    
-    return [self isReachableWithoutRequiringConnection:addressReachabilityFlags];
-}
-
-// ReachabilityCallback is registered as the callback for network state changes in startListeningForReachabilityChanges.
-static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info)
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    
-    // Post a notification to notify the client that the network reachability changed.
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"kNetworkReachabilityChangedNotification" object:nil];
-	
-	[pool release];
-}
-
-// Perform a reachability query for the address 0.0.0.0. If that address is reachable without
-// requiring a connection, a network interface is available. We'll have to do more work to
-// determine which network interface is available.
-- (BOOL)isNetworkAvailableFlags:(SCNetworkReachabilityFlags *)outFlags
-{
-	ReachabilityQuery *query = [self.reachabilityQueries objectForKey:kDefaultRouteKey];
-	SCNetworkReachabilityRef defaultRouteReachability = query.reachabilityRef;
-	
-    // If a cached reachability query was not found, create one.
-    if (!defaultRouteReachability) {
-        
-        struct sockaddr_in zeroAddress;
-        bzero(&zeroAddress, sizeof(zeroAddress));
-        zeroAddress.sin_len = sizeof(zeroAddress);
-        zeroAddress.sin_family = AF_INET;
-        
-        defaultRouteReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&zeroAddress);
-		
-		ReachabilityQuery *query = [[[ReachabilityQuery alloc] init] autorelease];
-		query.hostNameOrAddress = kDefaultRouteKey;
-		query.reachabilityRef = defaultRouteReachability;
-		
-		[self.reachabilityQueries setObject:query forKey:kDefaultRouteKey];
-    }
-	
-	// If necessary, register for notifcations for the SCNetworkReachabilityRef on the current run loop.
-	// If an existing SCNetworkReachabilityRef was found in the cache, we can reuse it and register
-	// to receive notifications from it in the current run loop, which may be different than the run loop
-	// that was previously used when registering the SCNetworkReachabilityRef for notifications. 
-    // -scheduleOnRunLoop: will schedule only if network status notifications are enabled in the Reachability instance.
-    // By default, they are not enabled. 
-	[query scheduleOnRunLoop:[NSRunLoop currentRunLoop]];
-	
-	SCNetworkReachabilityFlags flags;
-	BOOL gotFlags = SCNetworkReachabilityGetFlags(defaultRouteReachability, &flags);
-	if (!gotFlags) {
-        return NO;
-    }
-    
-	BOOL isReachable = [self isReachableWithoutRequiringConnection:flags];
-	
-	// Callers of this method might want to use the reachability flags, so if an 'out' parameter
-	// was passed in, assign the reachability flags to it.
-	if (outFlags) {
-		*outFlags = flags;
-	}
-	
-	return isReachable;
-}
-
-// Be a good citizen and unregister for network state changes when the application terminates.
-- (void)stopListeningForReachabilityChanges
-{
-	// Walk through the cache that holds SCNetworkReachabilityRefs for reachability
-	// queries to particular hosts or addresses.
-	NSEnumerator *enumerator = [self.reachabilityQueries objectEnumerator];
-	ReachabilityQuery *reachabilityQuery;
-    
-	while (reachabilityQuery = [enumerator nextObject]) {
-		
-		CFArrayRef runLoops = reachabilityQuery.runLoops;
-		NSUInteger runLoopCounter, maxRunLoops = CFArrayGetCount(runLoops);
-        
-		for (runLoopCounter = 0; runLoopCounter < maxRunLoops; runLoopCounter++) {
-			CFRunLoopRef nextRunLoop = (CFRunLoopRef)CFArrayGetValueAtIndex(runLoops, runLoopCounter);
-			
-			SCNetworkReachabilityUnscheduleFromRunLoop(reachabilityQuery.reachabilityRef, nextRunLoop, kCFRunLoopDefaultMode);
-		}
-        
-        CFArrayRemoveAllValues(reachabilityQuery.runLoops);
-	}
-}
-
-/*
- Create a SCNetworkReachabilityRef for hostName, which lets us determine if hostName
- is currently reachable, and lets us register to receive notifications when the 
- reachability of hostName changes.
- */
-- (SCNetworkReachabilityRef)reachabilityRefForHostName:(NSString *)hostName
-{
-	if (!hostName || ![hostName length]) {
-		return NULL;
-	}
-	
-	// Look in the cache for an existing SCNetworkReachabilityRef for hostName.
-	ReachabilityQuery *cachedQuery = [self.reachabilityQueries objectForKey:hostName];
-	SCNetworkReachabilityRef reachabilityRefForHostName = cachedQuery.reachabilityRef;
-	
-	if (reachabilityRefForHostName) {
-		return reachabilityRefForHostName;
-	}
-	
-	// Didn't find an existing SCNetworkReachabilityRef for hostName, so create one ...
-	reachabilityRefForHostName = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, [hostName UTF8String]);
-    
-    NSAssert1(reachabilityRefForHostName != NULL, @"Failed to create SCNetworkReachabilityRef for host: %@", hostName);
-    
-	ReachabilityQuery *query = [[[ReachabilityQuery alloc] init] autorelease];
-	query.hostNameOrAddress = hostName;
-	query.reachabilityRef = reachabilityRefForHostName;
-	
-    // If necessary, register for notifcations for the SCNetworkReachabilityRef on the current run loop.
-    // If an existing SCNetworkReachabilityRef was found in the cache, we can reuse it and register
-    // to receive notifications from it in the current run loop, which may be different than the run loop
-    // that was previously used when registering the SCNetworkReachabilityRef for notifications.
-    // -scheduleOnRunLoop: will schedule only if network status notifications are enabled in the Reachability instance.
-    // By default, they are not enabled. 
-    [query scheduleOnRunLoop:[NSRunLoop currentRunLoop]];
-    
-    // ... and add it to the cache.
-    [self.reachabilityQueries setObject:query forKey:hostName];
-    return reachabilityRefForHostName;
-}
-
-/*
- Create a SCNetworkReachabilityRef for the IP address in addressString, which lets us determine if 
- the address is currently reachable, and lets us register to receive notifications when the 
- reachability of the address changes.
- */
-- (SCNetworkReachabilityRef)reachabilityRefForAddress:(NSString *)addressString
-{
-	if (!addressString || ![addressString length]) {
-		return NULL;
-	}
-	
-	struct sockaddr_in address;
-	
-	BOOL gotAddress = [self addressFromString:addressString address:&address];
-	if (!gotAddress) {
-        // The attempt to convert addressString to a sockaddr_in failed.
-        NSAssert1(gotAddress != NO, @"Failed to convert an IP address string to a sockaddr_in: %@", addressString);
-		return NULL;
-	}
-	
-	// Look in the cache for an existing SCNetworkReachabilityRef for addressString.
-	ReachabilityQuery *cachedQuery = [self.reachabilityQueries objectForKey:addressString];
-	SCNetworkReachabilityRef reachabilityRefForAddress = cachedQuery.reachabilityRef;
-	
-	if (reachabilityRefForAddress) {
-		return reachabilityRefForAddress;
-	}
-	
-	// Didn't find an existing SCNetworkReachabilityRef for addressString, so create one.
-	reachabilityRefForAddress = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (struct sockaddr *)&address);
-    
-    NSAssert1(reachabilityRefForAddress != NULL, @"Failed to create SCNetworkReachabilityRef for address: %@", addressString);
-    
-	ReachabilityQuery *query = [[[ReachabilityQuery alloc] init] autorelease];
-	query.hostNameOrAddress = addressString;
-	query.reachabilityRef = reachabilityRefForAddress;
-    
-    // If necessary, register for notifcations for the SCNetworkReachabilityRef on the current run loop.
-    // If an existing SCNetworkReachabilityRef was found in the cache, we can reuse it and register
-    // to receive notifications from it in the current run loop, which may be different than the run loop
-    // that was previously used when registering the SCNetworkReachabilityRef for notifications.
-    // -scheduleOnRunLoop: will schedule only if network status notifications are enabled in the Reachability instance.
-    // By default, they are not enabled. 
-    [query scheduleOnRunLoop:[NSRunLoop currentRunLoop]];
-    
-    // ... and add it to the cache.
-    [self.reachabilityQueries setObject:query forKey:addressString];
-    return reachabilityRefForAddress;
-}
-
-- (NetworkStatus)remoteHostStatus
-{
-	/*
-     If the current host name or address is reachable, determine which network interface it is reachable through.
-     If the host is reachable and the reachability flags include kSCNetworkReachabilityFlagsIsWWAN, it
-     is reachable through the carrier data network. If the host is reachable and the reachability
-     flags do not include kSCNetworkReachabilityFlagsIsWWAN, it is reachable through the WiFi network.
-     */
-    
-	SCNetworkReachabilityRef reachabilityRef = nil;
-	if (self.hostName) {
-		reachabilityRef = [self reachabilityRefForHostName:self.hostName];
-		
-	} else if (self.address) {
-		reachabilityRef = [self reachabilityRefForAddress:self.address];
-		
-	} else {
-		NSAssert(self.hostName != nil && self.address != nil, @"No hostName or address specified. Cannot determine reachability.");
-		return NotReachable;
-	}
-	
-	if (!reachabilityRef) {
-		return NotReachable;
-	}
-	
-	SCNetworkReachabilityFlags reachabilityFlags;
-	BOOL gotFlags = SCNetworkReachabilityGetFlags(reachabilityRef, &reachabilityFlags);
-    if (!gotFlags) {
-        return NotReachable;
-    }
-    
-	BOOL reachable = [self isReachableWithoutRequiringConnection:reachabilityFlags];
-	
-	if (!reachable) {
-		return NotReachable;
-	}
-	if (reachabilityFlags & ReachableViaCarrierDataNetwork) {
-		return ReachableViaCarrierDataNetwork;
-	}
-	
-	return ReachableViaWiFiNetwork;
-}
-
-- (NetworkStatus)internetConnectionStatus
-{
-	/*
-     To determine if the device has an Internet connection, query the address
-     0.0.0.0. If it's reachable without requiring a connection, first check
-     for the kSCNetworkReachabilityFlagsIsDirect flag, which tell us if the connection
-     is to an ad-hoc WiFi network. If it is not, the device can access the Internet.
-     The next thing to determine is how the device can access the Internet, which
-     can either be through the carrier data network (EDGE or other service) or through
-     a WiFi connection.
-     
-     Note: Knowing that the device has an Internet connection is not the same as
-     knowing if the device can reach a particular host. To know that, use
-     -[Reachability remoteHostStatus].
-     */
-	
-	SCNetworkReachabilityFlags defaultRouteFlags;
-	BOOL defaultRouteIsAvailable = [self isNetworkAvailableFlags:&defaultRouteFlags];
-	if (defaultRouteIsAvailable) {
-        
-		if (defaultRouteFlags & kSCNetworkReachabilityFlagsIsDirect) {
-            
-			// The connection is to an ad-hoc WiFi network, so Internet access is not available.
-			return NotReachable;
-		}
-		else if (defaultRouteFlags & ReachableViaCarrierDataNetwork) {
-			return ReachableViaCarrierDataNetwork;
-		}
-		
-		return ReachableViaWiFiNetwork;
-	}
-	
-	return NotReachable;
-}
-
-- (NetworkStatus)localWiFiConnectionStatus
-{
-	SCNetworkReachabilityFlags selfAssignedAddressFlags;
-	
-	/*
-     To determine if the WiFi connection is to a local ad-hoc network,
-     check the availability of the address 169.254.x.x. That's an address
-     in the self-assigned range, and the device will have a self-assigned IP
-     when it's connected to a ad-hoc WiFi network. So to test if the device
-     has a self-assigned IP, look for the kSCNetworkReachabilityFlagsIsDirect flag
-     in the address query. If it's present, we know that the WiFi connection
-     is to an ad-hoc network.
-     */
-	// This returns YES if the address 169.254.0.0 is reachable without requiring a connection.
-	BOOL hasLinkLocalNetworkAccess = [self isAdHocWiFiNetworkAvailableFlags:&selfAssignedAddressFlags];
-    
-	if (hasLinkLocalNetworkAccess && (selfAssignedAddressFlags & kSCNetworkReachabilityFlagsIsDirect)) {
-		return ReachableViaWiFiNetwork;
-	}
-	
-	return NotReachable;
-}
-
-// Convert an IP address from an NSString to a sockaddr_in * that can be used to create
-// the reachability request.
-- (BOOL)addressFromString:(NSString *)IPAddress address:(struct sockaddr_in *)address
-{
-	if (!IPAddress || ![IPAddress length]) {
-		return NO;
-	}
-	
-	memset((char *) address, sizeof(struct sockaddr_in), 0);
-	address->sin_family = AF_INET;
-	address->sin_len = sizeof(struct sockaddr_in);
-	
-	int conversionResult = inet_aton([IPAddress UTF8String], &address->sin_addr);
-	if (conversionResult == 0) {
-		NSAssert1(conversionResult != 1, @"Failed to convert the IP address string into a sockaddr_in: %@", IPAddress);
-		return NO;
-	}
-	
-	return YES;
-}
-
-@end
-
-@interface ReachabilityQuery ()
-- (CFRunLoopRef)startListeningForReachabilityChanges:(SCNetworkReachabilityRef)reachability onRunLoop:(CFRunLoopRef)runLoop;
-@end
-
-@implementation ReachabilityQuery
-
-@synthesize reachabilityRef = _reachabilityRef;
-@synthesize runLoops = _runLoops;
-@synthesize hostNameOrAddress = _hostNameOrAddress;
-
-- (id)init
-{
-	self = [super init];
-	if (self != nil) {
-		self.runLoops = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
-	}
-	return self;
-}
-
-- (void)dealloc
-{
-	CFRelease(self.runLoops);
-	[super dealloc];
-}
-
-- (BOOL)isScheduledOnRunLoop:(CFRunLoopRef)runLoop
-{
-	NSUInteger runLoopCounter, maxRunLoops = CFArrayGetCount(self.runLoops);
-	
-	for (runLoopCounter = 0; runLoopCounter < maxRunLoops; runLoopCounter++) {
-		CFRunLoopRef nextRunLoop = (CFRunLoopRef)CFArrayGetValueAtIndex(self.runLoops, runLoopCounter);
-		
-		if (nextRunLoop == runLoop) {
-			return YES;
-		}
-	}
-	
-	return NO;
-}
-
-- (void)scheduleOnRunLoop:(NSRunLoop *)inRunLoop
-{
-	// Only register for network state changes if the client has specifically enabled them.
-	if ([[Reachability sharedReachability] networkStatusNotificationsEnabled] == NO) {
-		return;
-	}
-	
-	if (!inRunLoop) {
-		return;
-	}
-	
-	CFRunLoopRef runLoop = [inRunLoop getCFRunLoop];
-	
-	// Notifications of status changes for each reachability query can be scheduled on multiple run loops.
-	// To support that, register for notifications for each runLoop.
-	// -isScheduledOnRunLoop: iterates over all of the run loops that have previously been used
-	// to register for notifications. If one is found that matches the passed in runLoop argument, there's
-	// no need to register for notifications again. If one is not found, register for notifications
-	// using the current runLoop.
-	if (![self isScheduledOnRunLoop:runLoop]) {
-        
-		CFRunLoopRef notificationRunLoop = [self startListeningForReachabilityChanges:self.reachabilityRef onRunLoop:runLoop];
-		if (notificationRunLoop) {
-			CFArrayAppendValue(self.runLoops, notificationRunLoop);
-		}
-	}
-}
-
-// Register to receive changes to the 'reachability' query so that we can update the
-// user interface when the network state changes.
-- (CFRunLoopRef)startListeningForReachabilityChanges:(SCNetworkReachabilityRef)reachability onRunLoop:(CFRunLoopRef)runLoop
-{	
-	if (!reachability) {
-		return NULL;
-	}
-	
-	if (!runLoop) {
-		return NULL;
-	}
-    
-	SCNetworkReachabilityContext	context = {0, self, NULL, NULL, NULL};
-	SCNetworkReachabilitySetCallback(reachability, ReachabilityCallback, &context);
-	SCNetworkReachabilityScheduleWithRunLoop(reachability, runLoop, kCFRunLoopDefaultMode);
-	
-	return runLoop;
-}
-
-
-@end
diff --git a/iphone/FixMyStreet/Classes/Report.h b/iphone/FixMyStreet/Classes/Report.h
deleted file mode 100644
index 2e7b153cb..000000000
--- a/iphone/FixMyStreet/Classes/Report.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  Report.h
-//  FixMyStreet
-//
-//  Created by Matthew on 29/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <CoreLocation/CoreLocation.h>
-
-@interface Report : NSObject {
-}
-@end
diff --git a/iphone/FixMyStreet/Classes/Report.m b/iphone/FixMyStreet/Classes/Report.m
deleted file mode 100644
index afd71ede4..000000000
--- a/iphone/FixMyStreet/Classes/Report.m
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-//  Report.m
-//  FixMyStreet
-//
-//  Created by Matthew on 29/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-/*
-#import "Report.h"
-
-static Report *sharedReport = nil;
-
-@implementation Report
-
-@synthesize image, location, subject;
-
--(void)uploadReport {
-}
-
-// See "Creating a Singleton Instance" in the Cocoa Fundamentals Guide for more info
-
-+ (Report *)sharedInstance {
-    @synchronized(self) {
-        if (sharedReport == nil) {
-            [[self alloc] init]; // assignment not done here
-        }
-    }
-    return sharedReport;
-}
-
-+ (id)allocWithZone:(NSZone *)zone {
-    @synchronized(self) {
-        if (sharedReport == nil) {
-            sharedReport = [super allocWithZone:zone];
-            return sharedReport;  // assignment and return on first allocation
-        }
-    }
-    return nil; // on subsequent allocation attempts return nil
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
-    return self;
-}
-
-- (id)retain {
-    return self;
-}
-
-- (unsigned)retainCount {
-    return UINT_MAX;  // denotes an object that cannot be released
-}
-
-- (void)release {
-    //do nothing
-}
-
-- (id)autorelease {
-    return self;
-}
-
-@end
-*/
diff --git a/iphone/FixMyStreet/Classes/SettingsViewController.h b/iphone/FixMyStreet/Classes/SettingsViewController.h
deleted file mode 100644
index 1030129f9..000000000
--- a/iphone/FixMyStreet/Classes/SettingsViewController.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  SettingsViewController.h
-//  FixMyStreet
-//
-//  Created by Matthew on 20/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface SettingsViewController : UITableViewController {
-	UILabel *nameLabel;
-	UILabel *nameCurrent;
-	UILabel *emailLabel;
-	UILabel *emailCurrent;
-	UILabel *phoneLabel;
-	UILabel *phoneCurrent;
-	
-	BOOL firstTime;
-}
-
-@property (nonatomic, assign) BOOL firstTime;
-
-@end
diff --git a/iphone/FixMyStreet/Classes/SettingsViewController.m b/iphone/FixMyStreet/Classes/SettingsViewController.m
deleted file mode 100644
index c352f362a..000000000
--- a/iphone/FixMyStreet/Classes/SettingsViewController.m
+++ /dev/null
@@ -1,214 +0,0 @@
-//
-//  SettingsViewController.m
-//  FixMyStreet
-//
-//  Created by Matthew on 20/10/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import "SettingsViewController.h"
-#import "FixMyStreetAppDelegate.h"
-#import "EditSubjectViewController.h"
-
-@implementation SettingsViewController
-
-@synthesize firstTime;
-
-/*
-- (id)initWithStyle:(UITableViewStyle)style {
-    // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-    if (self = [super initWithStyle:style]) {
-    }
-    return self;
-}
-*/
-
-// Implement viewDidLoad to do additional setup after loading the view.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-	self.title = @"Your details";
-	self.tableView.sectionHeaderHeight = 20.0;
-	self.tableView.sectionFooterHeight = 0.0;
-	self.tableView.scrollEnabled = NO;
-	
-	UIBarButtonItem* backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Cancel" style:UIBarButtonSystemItemCancel target:nil action:nil];
-	self.navigationItem.backBarButtonItem = backBarButtonItem;
-	[backBarButtonItem release];
-	
-}
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-	if (self.firstTime)
-		return 4;
-    return 3;
-}
-
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-	return nil;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 1;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-	if (indexPath.section == 3) {
-		return 54.0;
-	}
-	return 44.0;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-
-	if (indexPath.section == 3) {
-		static NSString *CellIdentifier = @"InfoCell";
-		UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-		if (cell == nil) {
-			cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease];
-			UITextView *blurb = [[UITextView alloc] initWithFrame:CGRectMake(10, 0, 280, 44)];
-			blurb.font = [UIFont italicSystemFontOfSize:14];
-			blurb.textAlignment = UITextAlignmentCenter;
-			blurb.editable = NO;
-			blurb.text = @"Please fill in your details, and\nwe'll remember them for next time";
-			[cell.contentView addSubview:blurb];
-			[blurb release];
-		}
-		return cell;
-	}
-
-    static NSString *CellIdentifier = @"Cell";
-	FixMyStreetAppDelegate* delegate = [[UIApplication sharedApplication] delegate];
-
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-    if (cell == nil) {
-        cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease];
-		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-    }
-
-	NSString *text, *placeholder;
-	UILabel *label, *current;
-	if (indexPath.section == 0) {
-		text = delegate.name;
-		if (!nameLabel) {
-			nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(10,0,70,40)];
-			nameLabel.font = [UIFont boldSystemFontOfSize:17];
-			nameLabel.text = @"Name:";
-			[cell.contentView addSubview:nameLabel];
-		}
-		label = nameLabel;
-		if (!nameCurrent) {
-			nameCurrent = [[UILabel alloc] initWithFrame:CGRectMake(80,0,190,40)];
-			nameCurrent.font = [UIFont systemFontOfSize:17];
-			[cell.contentView addSubview:nameCurrent];
-		}
-		current = nameCurrent;
-		placeholder = @"Your name";
-	} else if (indexPath.section == 1) {
-		text = delegate.email;
-		if (!emailLabel) {
-			emailLabel = [[UILabel alloc] initWithFrame:CGRectMake(10,0,70,40)];
-			emailLabel.font = [UIFont boldSystemFontOfSize:17];
-			emailLabel.text = @"Email:";
-			[cell.contentView addSubview:emailLabel];
-		}
-		label = emailLabel;
-		if (!emailCurrent) {
-			emailCurrent = [[UILabel alloc] initWithFrame:CGRectMake(80,0,190,40)];
-			emailCurrent.font = [UIFont systemFontOfSize:17];
-			[cell.contentView addSubview:emailCurrent];
-		}
-		current = emailCurrent;
-		placeholder = @"Your email";
-	} else if (indexPath.section == 2) {
-		text = delegate.phone;
-		if (!phoneLabel) {
-			phoneLabel = [[UILabel alloc] initWithFrame:CGRectMake(10,0,70,40)];
-			phoneLabel.font = [UIFont boldSystemFontOfSize:17];
-			phoneLabel.text = @"Phone:";
-			[cell.contentView addSubview:phoneLabel];
-		}
-		label = phoneLabel;
-		if (!phoneCurrent) {
-			phoneCurrent = [[UILabel alloc] initWithFrame:CGRectMake(80,0,190,40)];
-			phoneCurrent.font = [UIFont systemFontOfSize:17];
-			[cell.contentView addSubview:phoneCurrent];
-		}
-		current = phoneCurrent;
-		placeholder = @"Your phone (optional)";
-	}
-
-	if (text) {
-		label.hidden = NO;
-		cell.textLabel.text = nil;
-		current.text = text;
-		current.hidden = NO;
-		// cell.accessoryType = UITableViewCellAccessoryCheckmark;
-	} else {
-		label.hidden = YES;
-		current.hidden = YES;
-		cell.textLabel.text = placeholder;
-		cell.textLabel.textColor = [UIColor grayColor];
-		// cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-	}
-		
-    return cell;
-}
-
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	[tableView deselectRowAtIndexPath:indexPath animated:YES];
-	if (indexPath.section == 3) {
-		return;
-	}
-
-	FixMyStreetAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
-	EditSubjectViewController* editSubjectViewController = [[EditSubjectViewController alloc] initWithStyle:UITableViewStyleGrouped];
-	if (indexPath.section == 0) {
-		[editSubjectViewController setAll:delegate.name viewTitle:@"Edit name" placeholder:@"Your name" keyboardType:UIKeyboardTypeDefault capitalisation:UITextAutocapitalizationTypeWords];
-	} else if (indexPath.section == 1) {
-		[editSubjectViewController setAll:delegate.email viewTitle:@"Edit email" placeholder:@"Your email" keyboardType:UIKeyboardTypeEmailAddress capitalisation:UITextAutocapitalizationTypeNone];
-	} else if (indexPath.section == 2) {
-		[editSubjectViewController setAll:delegate.phone viewTitle:@"Edit phone" placeholder:@"Your phone number" keyboardType:UIKeyboardTypeNumbersAndPunctuation capitalisation:UITextAutocapitalizationTypeNone];
-	}	
-
-	[self.navigationController pushViewController:editSubjectViewController animated:YES];
-	[editSubjectViewController release];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-	[self.tableView reloadData];
-//    [super viewWillAppear:animated];
-}
-
-/*
-- (void)viewDidAppear:(BOOL)animated {
-	[super viewDidAppear:animated];
-}
-*/
-/*
-- (void)viewWillDisappear:(BOOL)animated {
-}
-*/
-/*
-- (void)viewDidDisappear:(BOOL)animated {
-}
-*/
-/*
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-}
-*/
-
-- (void)dealloc {
-	[nameLabel release];
-	[emailLabel release];
-	[phoneLabel release];
-	[nameCurrent release];
-	[emailCurrent release];
-	[phoneCurrent release];
-    [super dealloc];
-}
-
-
-@end
-
diff --git a/iphone/FixMyStreet/Classes/imageCell.h b/iphone/FixMyStreet/Classes/imageCell.h
deleted file mode 100644
index 585ca7da1..000000000
--- a/iphone/FixMyStreet/Classes/imageCell.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  imageCell.h
-//  FixMyStreet
-//
-//  Created by Matthew on 29/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface imageCell : UITableViewCell {
-	UILabel* labelView;
-	UIImageView* imageView;
-}
-
-@property (nonatomic, retain) UIImageView* imageView;
-@property (nonatomic, retain) UILabel* labelView;
-
--(void)setData:(UIImage *)newImage;
-
-@end
diff --git a/iphone/FixMyStreet/Classes/imageCell.m b/iphone/FixMyStreet/Classes/imageCell.m
deleted file mode 100644
index 9b295bdfb..000000000
--- a/iphone/FixMyStreet/Classes/imageCell.m
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-//  imageCell.m
-//  FixMyStreet
-//
-//  Created by Matthew on 29/09/2008.
-//  Copyright 2008 UK Citizens Online Democracy. All rights reserved.
-//
-
-#import "imageCell.h"
-
-
-@implementation imageCell
-
-@synthesize imageView;
-@synthesize labelView;
-
-- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
-    if (self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) {
-		
-		UIFont *font = [UIFont boldSystemFontOfSize:17.0];
-		UILabel *newLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-		newLabel.backgroundColor = [UIColor clearColor];
-		//newLabel.backgroundColor = [UIColor whiteColor];
-		newLabel.opaque = YES;
-		newLabel.textColor = [UIColor blackColor];
-		newLabel.text = @"Take photo";
-		newLabel.highlightedTextColor = [UIColor whiteColor];
-		newLabel.font = font;
-		newLabel.textAlignment = UITextAlignmentLeft; // default
-		self.labelView = newLabel;
-		[self.contentView addSubview:newLabel];
-		[newLabel release];
-		self.imageView = [[UIImageView alloc] initWithFrame:CGRectZero];
-		[self.contentView addSubview:self.imageView];
-		//[self.imageView release];
-
-    }
-    return self;
-}
-
--(void)setData:(UIImage *)newImage {
-	//CGSize imageSize = newImage.size;
-	//float w = 100.0 / imageSize.width;
-	//imageView.frame = CGRectMake(150,5,100,imageSize.height * w);
-	//CGRect contentRect = self.contentView.bounds;
-	//contentRect.size = CGSizeMake(contentRect.size.width, imageSize.height*w);
-	imageView.image = newImage;
-	//self.contentView.bounds = contentRect;
-}
-
--(void)layoutSubviews {
-	[super layoutSubviews];
-	if (imageView.image) {
-		CGSize imageSize = imageView.image.size;
-		float w = 100.0 / imageSize.width;
-		imageView.frame = CGRectMake(10,0,100,imageSize.height * w);
-		labelView.frame = CGRectMake(120, imageSize.height * w / 2, 200, 20);
-	CGRect contentRect = self.contentView.bounds;
-	contentRect.size = CGSizeMake(contentRect.size.width, imageSize.height*w);
- self.contentView.bounds = contentRect;
-	} else {
-		labelView.frame = CGRectMake(10, 0, 200, 44);
-	}
-}
-
-- (void)dealloc {
-	[imageView dealloc];
-	[labelView dealloc];
-	[super dealloc];
-}
-
-@end
diff --git a/iphone/FixMyStreet/Classes/mysociety.png b/iphone/FixMyStreet/Classes/mysociety.png
deleted file mode 100644
index 8a9280c16..000000000
--- a/iphone/FixMyStreet/Classes/mysociety.png
+++ /dev/null
diff --git a/iphone/FixMyStreet/EditSubjectView.xib b/iphone/FixMyStreet/EditSubjectView.xib
deleted file mode 100644
index a3c99e9e3..000000000
--- a/iphone/FixMyStreet/EditSubjectView.xib
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02">
-	<data>
-		<int key="IBDocument.SystemTarget">528</int>
-		<string key="IBDocument.SystemVersion">9F33</string>
-		<string key="IBDocument.InterfaceBuilderVersion">672</string>
-		<string key="IBDocument.AppKitVersion">949.34</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-			</object>
-			<object class="IBProxyObject" id="711762367">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-			</object>
-			<object class="IBUITableView" id="219159568">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrameSize">{320, 480}</string>
-				<bool key="IBUIOpaque">NO</bool>
-				<bool key="IBUIClipsSubviews">YES</bool>
-				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-				<bool key="IBUIBouncesZoom">NO</bool>
-				<int key="IBUIStyle">1</int>
-				<int key="IBUISeparatorStyle">1</int>
-				<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-				<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-				<float key="IBUIRowHeight">4.400000e+01</float>
-				<float key="IBUISectionHeaderHeight">2.700000e+01</float>
-				<float key="IBUISectionFooterHeight">2.700000e+01</float>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="219159568"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">8</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="219159568"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="219159568"/>
-					</object>
-					<int key="connectionID">10</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="360949347">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="360949347"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="711762367"/>
-						<reference key="parent" ref="360949347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3</int>
-						<reference key="object" ref="219159568"/>
-						<reference key="parent" ref="360949347"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.CustomClassName</string>
-					<string>-2.CustomClassName</string>
-					<string>3.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>EditSubjectViewController</string>
-					<string>UIResponder</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">10</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">EditSubjectViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancel:</string>
-							<string>save:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">summaryTextField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Classes/EditSubjectViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">FixMyStreet.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
diff --git a/iphone/FixMyStreet/Entitlements.plist b/iphone/FixMyStreet/Entitlements.plist
deleted file mode 100644
index ce373e19b..000000000
--- a/iphone/FixMyStreet/Entitlements.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>get-task-allow</key>
-	<false/>
-</dict>
-</plist>
diff --git a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.mode1v3 b/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.mode1v3
deleted file mode 100644
index c982a08c8..000000000
--- a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.mode1v3
+++ /dev/null
@@ -1,1475 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ActivePerspectiveName</key>
-	<string>Project</string>
-	<key>AllowedModules</key>
-	<array>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXSmartGroupTreeModule</string>
-			<key>Name</key>
-			<string>Groups and Files Outline View</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXNavigatorGroup</string>
-			<key>Name</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCTaskListModule</string>
-			<key>Name</key>
-			<string>Task List</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCDetailModule</string>
-			<key>Name</key>
-			<string>File and Smart Group Detail Viewer</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXBuildResultsModule</string>
-			<key>Name</key>
-			<string>Detailed Build Results Viewer</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXProjectFindModule</string>
-			<key>Name</key>
-			<string>Project Batch Find Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCProjectFormatConflictsModule</string>
-			<key>Name</key>
-			<string>Project Format Conflicts List</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXBookmarksModule</string>
-			<key>Name</key>
-			<string>Bookmarks Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXClassBrowserModule</string>
-			<key>Name</key>
-			<string>Class Browser</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXCVSModule</string>
-			<key>Name</key>
-			<string>Source Code Control Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXDebugBreakpointsModule</string>
-			<key>Name</key>
-			<string>Debug Breakpoints Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCDockableInspector</string>
-			<key>Name</key>
-			<string>Inspector</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXOpenQuicklyModule</string>
-			<key>Name</key>
-			<string>Open Quickly Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXDebugSessionModule</string>
-			<key>Name</key>
-			<string>Debugger</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXDebugCLIModule</string>
-			<key>Name</key>
-			<string>Debug Console</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCSnapshotModule</string>
-			<key>Name</key>
-			<string>Snapshots Tool</string>
-		</dict>
-	</array>
-	<key>BundlePath</key>
-	<string>/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources</string>
-	<key>Description</key>
-	<string>DefaultDescriptionKey</string>
-	<key>DockingSystemVisible</key>
-	<false/>
-	<key>Extension</key>
-	<string>mode1v3</string>
-	<key>FavBarConfig</key>
-	<dict>
-		<key>PBXProjectModuleGUID</key>
-		<string>3477106E0E8BD7BA0051DFFD</string>
-		<key>XCBarModuleItemNames</key>
-		<dict/>
-		<key>XCBarModuleItems</key>
-		<array/>
-	</dict>
-	<key>FirstTimeWindowDisplayed</key>
-	<false/>
-	<key>Identifier</key>
-	<string>com.apple.perspectives.project.mode1v3</string>
-	<key>MajorVersion</key>
-	<integer>33</integer>
-	<key>MinorVersion</key>
-	<integer>0</integer>
-	<key>Name</key>
-	<string>Default</string>
-	<key>Notifications</key>
-	<array/>
-	<key>OpenEditors</key>
-	<array/>
-	<key>PerspectiveWidths</key>
-	<array>
-		<integer>-1</integer>
-		<integer>-1</integer>
-	</array>
-	<key>Perspectives</key>
-	<array>
-		<dict>
-			<key>ChosenToolbarItems</key>
-			<array>
-				<string>active-combo-popup</string>
-				<string>action</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>build-and-go</string>
-				<string>com.apple.ide.PBXToolbarStopButton</string>
-				<string>get-info</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>com.apple.pbx.toolbar.searchfield</string>
-			</array>
-			<key>ControllerClassBaseName</key>
-			<string></string>
-			<key>IconName</key>
-			<string>WindowOfProjectWithEditor</string>
-			<key>Identifier</key>
-			<string>perspective.project</string>
-			<key>IsVertical</key>
-			<false/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>BecomeActive</key>
-					<true/>
-					<key>ContentConfiguration</key>
-					<dict>
-						<key>PBXBottomSmartGroupGIDs</key>
-						<array>
-							<string>1C37FBAC04509CD000000102</string>
-							<string>1C37FAAC04509CD000000102</string>
-							<string>1C08E77C0454961000C914BD</string>
-							<string>1C37FABC05509CD000000102</string>
-							<string>1C37FABC05539CD112110102</string>
-							<string>E2644B35053B69B200211256</string>
-							<string>1C37FABC04509CD000100104</string>
-							<string>1CC0EA4004350EF90044410B</string>
-							<string>1CC0EA4004350EF90041110B</string>
-						</array>
-						<key>PBXProjectModuleGUID</key>
-						<string>1CE0B1FE06471DED0097A5F4</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Files</string>
-						<key>PBXProjectStructureProvided</key>
-						<string>yes</string>
-						<key>PBXSmartGroupTreeModuleColumnData</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
-							<array>
-								<real>22</real>
-								<real>221</real>
-							</array>
-							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
-							<array>
-								<string>SCMStatusColumn</string>
-								<string>MainColumn</string>
-							</array>
-						</dict>
-						<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
-							<array>
-								<string>29B97314FDCFA39411CA2CEA</string>
-								<string>080E96DDFE201D6D7F000001</string>
-								<string>342F98AD0E951731006935E9</string>
-								<string>29B97317FDCFA39411CA2CEA</string>
-								<string>19C28FACFE9D520D11CA2CBB</string>
-								<string>1C37FBAC04509CD000000102</string>
-								<string>E2644B35053B69B200211256</string>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-							<array>
-								<array>
-									<integer>44</integer>
-									<integer>42</integer>
-								</array>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {243, 939}}</string>
-						</dict>
-						<key>PBXTopSmartGroupGIDs</key>
-						<array/>
-						<key>XCIncludePerspectivesSwitch</key>
-						<true/>
-						<key>XCSharingToken</key>
-						<string>com.apple.Xcode.GFSharingToken</string>
-					</dict>
-					<key>GeometryConfiguration</key>
-					<dict>
-						<key>Frame</key>
-						<string>{{0, 0}, {260, 957}}</string>
-						<key>GroupTreeTableConfiguration</key>
-						<array>
-							<string>SCMStatusColumn</string>
-							<real>22</real>
-							<string>MainColumn</string>
-							<real>221</real>
-						</array>
-						<key>RubberWindowFrame</key>
-						<string>41 180 1555 998 0 0 1920 1178 </string>
-					</dict>
-					<key>Module</key>
-					<string>PBXSmartGroupTreeModule</string>
-					<key>Proportion</key>
-					<string>260pt</string>
-				</dict>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CE0B20306471E060097A5F4</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>InputTableViewController.h</string>
-								<key>PBXSplitModuleInNavigatorKey</key>
-								<dict>
-									<key>Split0</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CE0B20406471E060097A5F4</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>InputTableViewController.h</string>
-										<key>_historyCapacity</key>
-										<integer>0</integer>
-										<key>bookmark</key>
-										<string>341D130A0F01B4650095C69B</string>
-										<key>history</key>
-										<array>
-											<string>34865A1D0EE7F0B000716A66</string>
-											<string>34865A630EE7FB7600716A66</string>
-											<string>34865AE60EE8002400716A66</string>
-											<string>341D12D30F01B1CC0095C69B</string>
-											<string>341D12D40F01B1CC0095C69B</string>
-											<string>341D12D60F01B1CC0095C69B</string>
-											<string>341D12E80F01B2820095C69B</string>
-											<string>341D13020F01B4650095C69B</string>
-											<string>341D13030F01B4650095C69B</string>
-											<string>341D13040F01B4650095C69B</string>
-											<string>341D13050F01B4650095C69B</string>
-										</array>
-										<key>prevStack</key>
-										<array>
-											<string>34865A230EE7F0B000716A66</string>
-											<string>34865A260EE7F0B000716A66</string>
-											<string>34865A2A0EE7F0B000716A66</string>
-											<string>34865A2B0EE7F0B000716A66</string>
-											<string>34865A2F0EE7F0B000716A66</string>
-											<string>34865A5A0EE7F29C00716A66</string>
-											<string>34865A680EE7FB7600716A66</string>
-											<string>341D12940F01A5D90095C69B</string>
-											<string>341D12950F01A5D90095C69B</string>
-											<string>341D12960F01A5D90095C69B</string>
-											<string>341D12970F01A5D90095C69B</string>
-											<string>341D12980F01A5D90095C69B</string>
-											<string>341D12990F01A5D90095C69B</string>
-											<string>341D129A0F01A5D90095C69B</string>
-											<string>341D129B0F01A5D90095C69B</string>
-											<string>341D12BA0F01A9420095C69B</string>
-											<string>341D12BB0F01A9420095C69B</string>
-											<string>341D12BC0F01A9420095C69B</string>
-											<string>341D12D80F01B1CC0095C69B</string>
-											<string>341D12D90F01B1CC0095C69B</string>
-											<string>341D12DA0F01B1CC0095C69B</string>
-											<string>341D12DB0F01B1CC0095C69B</string>
-											<string>341D12DC0F01B1CC0095C69B</string>
-											<string>341D12DD0F01B1CC0095C69B</string>
-											<string>341D12DE0F01B1CC0095C69B</string>
-											<string>341D12DF0F01B1CC0095C69B</string>
-											<string>341D12E00F01B1CC0095C69B</string>
-											<string>341D12E10F01B1CC0095C69B</string>
-											<string>341D12E20F01B1CC0095C69B</string>
-											<string>341D12E30F01B1CC0095C69B</string>
-											<string>341D12E40F01B1CC0095C69B</string>
-											<string>341D12E50F01B1CC0095C69B</string>
-											<string>341D12EA0F01B2820095C69B</string>
-											<string>341D12EB0F01B2820095C69B</string>
-											<string>341D12EC0F01B2820095C69B</string>
-											<string>341D12ED0F01B2820095C69B</string>
-											<string>341D13060F01B4650095C69B</string>
-											<string>341D13070F01B4650095C69B</string>
-											<string>341D13080F01B4650095C69B</string>
-											<string>341D13090F01B4650095C69B</string>
-										</array>
-									</dict>
-									<key>SplitCount</key>
-									<string>1</string>
-								</dict>
-								<key>StatusBarVisibility</key>
-								<true/>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {1290, 802}}</string>
-								<key>RubberWindowFrame</key>
-								<string>41 180 1555 998 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>802pt</string>
-						</dict>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CE0B20506471E060097A5F4</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Detail</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 807}, {1290, 150}}</string>
-								<key>RubberWindowFrame</key>
-								<string>41 180 1555 998 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>XCDetailModule</string>
-							<key>Proportion</key>
-							<string>150pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>1290pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCModuleDock</string>
-				<string>PBXSmartGroupTreeModule</string>
-				<string>XCModuleDock</string>
-				<string>PBXNavigatorGroup</string>
-				<string>XCDetailModule</string>
-			</array>
-			<key>TableOfContents</key>
-			<array>
-				<string>341D12810F01A1C70095C69B</string>
-				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>341D12820F01A1C70095C69B</string>
-				<string>1CE0B20306471E060097A5F4</string>
-				<string>1CE0B20506471E060097A5F4</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.defaultV3</string>
-		</dict>
-		<dict>
-			<key>ControllerClassBaseName</key>
-			<string></string>
-			<key>IconName</key>
-			<string>WindowOfProject</string>
-			<key>Identifier</key>
-			<string>perspective.morph</string>
-			<key>IsVertical</key>
-			<integer>0</integer>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>BecomeActive</key>
-					<integer>1</integer>
-					<key>ContentConfiguration</key>
-					<dict>
-						<key>PBXBottomSmartGroupGIDs</key>
-						<array>
-							<string>1C37FBAC04509CD000000102</string>
-							<string>1C37FAAC04509CD000000102</string>
-							<string>1C08E77C0454961000C914BD</string>
-							<string>1C37FABC05509CD000000102</string>
-							<string>1C37FABC05539CD112110102</string>
-							<string>E2644B35053B69B200211256</string>
-							<string>1C37FABC04509CD000100104</string>
-							<string>1CC0EA4004350EF90044410B</string>
-							<string>1CC0EA4004350EF90041110B</string>
-						</array>
-						<key>PBXProjectModuleGUID</key>
-						<string>11E0B1FE06471DED0097A5F4</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Files</string>
-						<key>PBXProjectStructureProvided</key>
-						<string>yes</string>
-						<key>PBXSmartGroupTreeModuleColumnData</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
-							<array>
-								<real>186</real>
-							</array>
-							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
-							<array>
-								<string>MainColumn</string>
-							</array>
-						</dict>
-						<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
-							<array>
-								<string>29B97314FDCFA39411CA2CEA</string>
-								<string>1C37FABC05509CD000000102</string>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-							<array>
-								<array>
-									<integer>0</integer>
-								</array>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {186, 337}}</string>
-						</dict>
-						<key>PBXTopSmartGroupGIDs</key>
-						<array/>
-						<key>XCIncludePerspectivesSwitch</key>
-						<integer>1</integer>
-						<key>XCSharingToken</key>
-						<string>com.apple.Xcode.GFSharingToken</string>
-					</dict>
-					<key>GeometryConfiguration</key>
-					<dict>
-						<key>Frame</key>
-						<string>{{0, 0}, {203, 355}}</string>
-						<key>GroupTreeTableConfiguration</key>
-						<array>
-							<string>MainColumn</string>
-							<real>186</real>
-						</array>
-						<key>RubberWindowFrame</key>
-						<string>373 269 690 397 0 0 1440 878 </string>
-					</dict>
-					<key>Module</key>
-					<string>PBXSmartGroupTreeModule</string>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Morph</string>
-			<key>PreferredWidth</key>
-			<integer>300</integer>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCModuleDock</string>
-				<string>PBXSmartGroupTreeModule</string>
-			</array>
-			<key>TableOfContents</key>
-			<array>
-				<string>11E0B1FE06471DED0097A5F4</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.default.shortV3</string>
-		</dict>
-	</array>
-	<key>PerspectivesBarVisible</key>
-	<false/>
-	<key>ShelfIsVisible</key>
-	<false/>
-	<key>SourceDescription</key>
-	<string>file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
-	<key>StatusbarIsVisible</key>
-	<true/>
-	<key>TimeStamp</key>
-	<real>0.0</real>
-	<key>ToolbarDisplayMode</key>
-	<integer>1</integer>
-	<key>ToolbarIsVisible</key>
-	<true/>
-	<key>ToolbarSizeMode</key>
-	<integer>1</integer>
-	<key>Type</key>
-	<string>Perspectives</string>
-	<key>UpdateMessage</key>
-	<string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature).  You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature.  Do you wish to update to the latest Workspace defaults for project '%@'?</string>
-	<key>WindowJustification</key>
-	<integer>5</integer>
-	<key>WindowOrderList</key>
-	<array>
-		<string>1C78EAAD065D492600B07095</string>
-		<string>3477106F0E8BD7BA0051DFFD</string>
-		<string>1C530D57069F1CE1000CFCEE</string>
-		<string>1CD10A99069EF8BA00B06720</string>
-		<string>/Users/matthew/Projects/mySociety/iPhone/FixMyStreet/FixMyStreet.xcodeproj</string>
-	</array>
-	<key>WindowString</key>
-	<string>41 180 1555 998 0 0 1920 1178 </string>
-	<key>WindowToolsV3</key>
-	<array>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.build</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD0528F0623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string></string>
-								<key>StatusBarVisibility</key>
-								<true/>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {876, 236}}</string>
-								<key>RubberWindowFrame</key>
-								<string>542 318 876 600 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>236pt</string>
-						</dict>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
-								<string>{{0, 5}, {876, 313}}</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>XCMainBuildResultsModuleGUID</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Build</string>
-								<key>XCBuildResultsTrigger_Collapse</key>
-								<integer>1021</integer>
-								<key>XCBuildResultsTrigger_Open</key>
-								<integer>1011</integer>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 241}, {876, 318}}</string>
-								<key>RubberWindowFrame</key>
-								<string>542 318 876 600 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXBuildResultsModule</string>
-							<key>Proportion</key>
-							<string>318pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>559pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Build Results</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXBuildResultsModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>3477106F0E8BD7BA0051DFFD</string>
-				<string>341D129D0F01A5D90095C69B</string>
-				<string>1CD0528F0623707200166675</string>
-				<string>XCMainBuildResultsModuleGUID</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.buildV3</string>
-			<key>WindowString</key>
-			<string>542 318 876 600 0 0 1920 1178 </string>
-			<key>WindowToolGUID</key>
-			<string>3477106F0E8BD7BA0051DFFD</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.debugger</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>Debugger</key>
-								<dict>
-									<key>HorizontalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {442, 549}}</string>
-											<string>{{442, 0}, {506, 549}}</string>
-										</array>
-									</dict>
-									<key>VerticalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {948, 549}}</string>
-											<string>{{0, 549}, {948, 258}}</string>
-										</array>
-									</dict>
-								</dict>
-								<key>LauncherConfigVersion</key>
-								<string>8</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C162984064C10D400B95A72</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Debug - GLUTExamples (Underwater)</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>DebugConsoleVisible</key>
-								<string>None</string>
-								<key>DebugConsoleWindowFrame</key>
-								<string>{{200, 200}, {500, 300}}</string>
-								<key>DebugSTDIOWindowFrame</key>
-								<string>{{200, 200}, {500, 300}}</string>
-								<key>Frame</key>
-								<string>{{0, 0}, {948, 807}}</string>
-								<key>PBXDebugSessionStackFrameViewKey</key>
-								<dict>
-									<key>DebugVariablesTableConfiguration</key>
-									<array>
-										<string>Name</string>
-										<real>149</real>
-										<string>Value</string>
-										<real>114</real>
-										<string>Summary</string>
-										<real>218</real>
-									</array>
-									<key>Frame</key>
-									<string>{{442, 0}, {506, 549}}</string>
-									<key>RubberWindowFrame</key>
-									<string>388 301 948 848 0 0 1920 1178 </string>
-								</dict>
-								<key>RubberWindowFrame</key>
-								<string>388 301 948 848 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXDebugSessionModule</string>
-							<key>Proportion</key>
-							<string>807pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>807pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debugger</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXDebugSessionModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>1CD10A99069EF8BA00B06720</string>
-				<string>341D12860F01A54C0095C69B</string>
-				<string>1C162984064C10D400B95A72</string>
-				<string>341D12870F01A54C0095C69B</string>
-				<string>341D12880F01A54C0095C69B</string>
-				<string>341D12890F01A54C0095C69B</string>
-				<string>341D128A0F01A54C0095C69B</string>
-				<string>341D128B0F01A54C0095C69B</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.debugV3</string>
-			<key>WindowString</key>
-			<string>388 301 948 848 0 0 1920 1178 </string>
-			<key>WindowToolGUID</key>
-			<string>1CD10A99069EF8BA00B06720</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.find</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Dock</key>
-							<array>
-								<dict>
-									<key>ContentConfiguration</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CDD528C0622207200134675</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>InputTableViewController.m</string>
-										<key>StatusBarVisibility</key>
-										<true/>
-									</dict>
-									<key>GeometryConfiguration</key>
-									<dict>
-										<key>Frame</key>
-										<string>{{0, 0}, {813, 396}}</string>
-										<key>RubberWindowFrame</key>
-										<string>698 214 813 753 0 0 1920 1178 </string>
-									</dict>
-									<key>Module</key>
-									<string>PBXNavigatorGroup</string>
-									<key>Proportion</key>
-									<string>813pt</string>
-								</dict>
-							</array>
-							<key>Proportion</key>
-							<string>396pt</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<true/>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD0528E0623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Project Find</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 401}, {813, 311}}</string>
-								<key>RubberWindowFrame</key>
-								<string>698 214 813 753 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXProjectFindModule</string>
-							<key>Proportion</key>
-							<string>311pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>712pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project Find</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXProjectFindModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>341D128D0F01A54C0095C69B</string>
-				<string>341D128E0F01A54C0095C69B</string>
-				<string>1CDD528C0622207200134675</string>
-				<string>1CD0528E0623707200166675</string>
-			</array>
-			<key>WindowString</key>
-			<string>698 214 813 753 0 0 1920 1178 </string>
-			<key>WindowToolGUID</key>
-			<string>1C530D57069F1CE1000CFCEE</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>MENUSEPARATOR</string>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.debuggerConsole</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C78EAAC065D492600B07095</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Debugger Console</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {650, 209}}</string>
-								<key>RubberWindowFrame</key>
-								<string>57 749 650 250 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXDebugCLIModule</string>
-							<key>Proportion</key>
-							<string>209pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>209pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debugger Console</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXDebugCLIModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C78EAAD065D492600B07095</string>
-				<string>341D129E0F01A5D90095C69B</string>
-				<string>1C78EAAC065D492600B07095</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.consoleV3</string>
-			<key>WindowString</key>
-			<string>57 749 650 250 0 0 1920 1178 </string>
-			<key>WindowToolGUID</key>
-			<string>1C78EAAD065D492600B07095</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.snapshots</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>XCSnapshotModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Snapshots</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCSnapshotModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<string>Yes</string>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.snapshots</string>
-			<key>WindowString</key>
-			<string>315 824 300 550 0 0 1440 878 </string>
-			<key>WindowToolIsVisible</key>
-			<string>Yes</string>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.scm</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C78EAB2065D492600B07095</string>
-								<key>PBXProjectModuleLabel</key>
-								<string></string>
-								<key>StatusBarVisibility</key>
-								<true/>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {637, 279}}</string>
-								<key>RubberWindowFrame</key>
-								<string>1080 290 637 727 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>279pt</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<true/>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXCVSModuleFilterTypeKey</key>
-								<integer>1030</integer>
-								<key>PBXCVSModuleTreeModuleColumnData</key>
-								<dict>
-									<key>PBXCVSModuleTreeModuleColumnWidthsKey</key>
-									<array>
-										<real>221</real>
-										<real>56</real>
-										<real>63</real>
-										<real>60</real>
-										<real>63</real>
-										<real>139</real>
-									</array>
-									<key>PBXCVSModuleTreeModuleColumnsKey</key>
-									<array>
-										<string>Name</string>
-										<string>Status</string>
-										<string>Update</string>
-										<string>Revision</string>
-										<string>Author</string>
-										<string>Date</string>
-									</array>
-								</dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD052920623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>SCM Results</string>
-								<key>SCMActivityViewerShowingDefaultKey</key>
-								<string>{{0, 288}, {637, 114}}</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 284}, {637, 402}}</string>
-								<key>RubberWindowFrame</key>
-								<string>1080 290 637 727 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXCVSModule</string>
-							<key>Proportion</key>
-							<string>402pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>686pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>SCM</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXCVSModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>342F995D0E9526F4006935E9</string>
-				<string>34C17AAA0EB0CD7500768D1C</string>
-				<string>1C78EAB2065D492600B07095</string>
-				<string>1CD052920623707200166675</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.scm</string>
-			<key>WindowString</key>
-			<string>1080 290 637 727 0 0 1920 1178 </string>
-			<key>WindowToolGUID</key>
-			<string>342F995D0E9526F4006935E9</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.breakpoints</string>
-			<key>IsVertical</key>
-			<false/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXBottomSmartGroupGIDs</key>
-								<array>
-									<string>1C77FABC04509CD000000102</string>
-								</array>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CE0B1FE06471DED0097A5F4</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Files</string>
-								<key>PBXProjectStructureProvided</key>
-								<string>no</string>
-								<key>PBXSmartGroupTreeModuleColumnData</key>
-								<dict>
-									<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
-									<array>
-										<real>168</real>
-									</array>
-									<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
-									<array>
-										<string>MainColumn</string>
-									</array>
-								</dict>
-								<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
-								<dict>
-									<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
-									<array>
-										<string>1C77FABC04509CD000000102</string>
-										<string>1C3E0DCA080725EA00A55177</string>
-									</array>
-									<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-									<array>
-										<array>
-											<integer>0</integer>
-										</array>
-									</array>
-									<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-									<string>{{0, 0}, {168, 350}}</string>
-								</dict>
-								<key>PBXTopSmartGroupGIDs</key>
-								<array/>
-								<key>XCIncludePerspectivesSwitch</key>
-								<false/>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {185, 368}}</string>
-								<key>GroupTreeTableConfiguration</key>
-								<array>
-									<string>MainColumn</string>
-									<real>168</real>
-								</array>
-								<key>RubberWindowFrame</key>
-								<string>78 567 744 409 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXSmartGroupTreeModule</string>
-							<key>Proportion</key>
-							<string>185pt</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<true/>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CA1AED706398EBD00589147</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Detail</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{190, 0}, {554, 368}}</string>
-								<key>RubberWindowFrame</key>
-								<string>78 567 744 409 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>XCDetailModule</string>
-							<key>Proportion</key>
-							<string>554pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>368pt</string>
-				</dict>
-			</array>
-			<key>MajorVersion</key>
-			<integer>3</integer>
-			<key>MinorVersion</key>
-			<integer>0</integer>
-			<key>Name</key>
-			<string>Breakpoints</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXSmartGroupTreeModule</string>
-				<string>XCDetailModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>345577C40EAE256B008C5D7F</string>
-				<string>345577C50EAE256B008C5D7F</string>
-				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1CA1AED706398EBD00589147</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.breakpointsV3</string>
-			<key>WindowString</key>
-			<string>78 567 744 409 0 0 1920 1178 </string>
-			<key>WindowToolGUID</key>
-			<string>345577C40EAE256B008C5D7F</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.debugAnimator</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debug Visualizer</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXNavigatorGroup</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.debugAnimatorV3</string>
-			<key>WindowString</key>
-			<string>100 100 700 500 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.bookmarks</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>PBXBookmarksModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Bookmarks</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXBookmarksModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>WindowString</key>
-			<string>538 42 401 187 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.projectFormatConflicts</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>XCProjectFormatConflictsModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project Format Conflicts</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCProjectFormatConflictsModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>WindowContentMinSize</key>
-			<string>450 300</string>
-			<key>WindowString</key>
-			<string>50 850 472 307 0 0 1440 877</string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.classBrowser</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>OptionsSetName</key>
-								<string>Hierarchy, all classes</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CA6456E063B45B4001379D8</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Class Browser - NSObject</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>ClassesFrame</key>
-								<string>{{0, 0}, {374, 96}}</string>
-								<key>ClassesTreeTableConfiguration</key>
-								<array>
-									<string>PBXClassNameColumnIdentifier</string>
-									<real>208</real>
-									<string>PBXClassBookColumnIdentifier</string>
-									<real>22</real>
-								</array>
-								<key>Frame</key>
-								<string>{{0, 0}, {630, 331}}</string>
-								<key>MembersFrame</key>
-								<string>{{0, 105}, {374, 395}}</string>
-								<key>MembersTreeTableConfiguration</key>
-								<array>
-									<string>PBXMemberTypeIconColumnIdentifier</string>
-									<real>22</real>
-									<string>PBXMemberNameColumnIdentifier</string>
-									<real>216</real>
-									<string>PBXMemberTypeColumnIdentifier</string>
-									<real>97</real>
-									<string>PBXMemberBookColumnIdentifier</string>
-									<real>22</real>
-								</array>
-								<key>PBXModuleWindowStatusBarHidden2</key>
-								<integer>1</integer>
-								<key>RubberWindowFrame</key>
-								<string>385 179 630 352 0 0 1440 878 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXClassBrowserModule</string>
-							<key>Proportion</key>
-							<string>332pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>332pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Class Browser</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXClassBrowserModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C0AD2AF069F1E9B00FABCE6</string>
-				<string>1C0AD2B0069F1E9B00FABCE6</string>
-				<string>1CA6456E063B45B4001379D8</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.classbrowser</string>
-			<key>WindowString</key>
-			<string>385 179 630 352 0 0 1440 878 </string>
-			<key>WindowToolGUID</key>
-			<string>1C0AD2AF069F1E9B00FABCE6</string>
-			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.refactoring</string>
-			<key>IncludeInToolsMenu</key>
-			<integer>0</integer>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>349AFEA20E925A4D008E83C1</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {500, 315}}</string>
-								<key>RubberWindowFrame</key>
-								<string>580 421 500 356 0 0 1920 1178 </string>
-							</dict>
-							<key>Module</key>
-							<string>XCRefactoringModule</string>
-							<key>Proportion</key>
-							<string>315pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>315pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Refactoring</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCRefactoringModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>349AFEA30E925A4D008E83C1</string>
-				<string>349AFEA40E925A4D008E83C1</string>
-				<string>349AFEA20E925A4D008E83C1</string>
-			</array>
-			<key>WindowString</key>
-			<string>580 421 500 356 0 0 1920 1178 </string>
-			<key>WindowToolGUID</key>
-			<string>349AFEA30E925A4D008E83C1</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.pbxuser b/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.pbxuser
deleted file mode 100644
index 7185b29fe..000000000
--- a/iphone/FixMyStreet/FixMyStreet.xcodeproj/matthew.pbxuser
+++ /dev/null
@@ -1,1783 +0,0 @@
-// !$*UTF8*$!
-{
-	1D3623240D0F684500981E51 /* FixMyStreetAppDelegate.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 753}}";
-			sepNavSelRange = "{351, 0}";
-			sepNavVisRange = "{0, 1201}";
-			sepNavWindowFrame = "{{15, 94}, {738, 1079}}";
-		};
-	};
-	1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 3262}}";
-			sepNavSelRange = "{6093, 0}";
-			sepNavVisRange = "{5040, 3320}";
-			sepNavWindowFrame = "{{130, 510}, {750, 558}}";
-		};
-	};
-	1D6058900D05DD3D006BFB54 /* FixMyStreet */ = {
-		activeExec = 0;
-		executables = (
-			347710680E8BD7AA0051DFFD /* FixMyStreet */,
-		);
-	};
-	29B97313FDCFA39411CA2CEA /* Project object */ = {
-		activeBuildConfigurationName = Debug;
-		activeExecutable = 347710680E8BD7AA0051DFFD /* FixMyStreet */;
-		activeSDKPreference = iphonesimulator2.1;
-		activeTarget = 1D6058900D05DD3D006BFB54 /* FixMyStreet */;
-		addToTargets = (
-			1D6058900D05DD3D006BFB54 /* FixMyStreet */,
-		);
-		breakpoints = (
-			345577AE0EAE24AF008C5D7F /* EditSubjectViewController.m:152 */,
-			345577D30EAE262B008C5D7F /* EditSubjectViewController.m:152 */,
-			345577D50EAE262C008C5D7F /* EditSubjectViewController.m:152 */,
-		);
-		codeSenseManager = 347710790E8BD7BA0051DFFD /* Code sense */;
-		executables = (
-			347710680E8BD7AA0051DFFD /* FixMyStreet */,
-		);
-		perUserDictionary = {
-			"PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_BreakpointID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					20,
-					198,
-					20,
-					99,
-					99,
-					29,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXBreakpointsDataSource_ActionID,
-					PBXBreakpointsDataSource_TypeID,
-					PBXBreakpointsDataSource_BreakpointID,
-					PBXBreakpointsDataSource_UseID,
-					PBXBreakpointsDataSource_LocationID,
-					PBXBreakpointsDataSource_ConditionID,
-					PBXBreakpointsDataSource_IgnoreCountID,
-					PBXBreakpointsDataSource_ContinueID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXBookmarksDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXBookmarksDataSource_NameID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					200,
-					200,
-					861,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXBookmarksDataSource_LocationID,
-					PBXBookmarksDataSource_NameID,
-					PBXBookmarksDataSource_CommentsID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXErrorsWarningsDataSource_LocationID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					300,
-					941,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXErrorsWarningsDataSource_TypeID,
-					PBXErrorsWarningsDataSource_MessageID,
-					PBXErrorsWarningsDataSource_LocationID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = 1;
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					1051,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXSymbolsDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXSymbolsDataSource_SymbolNameID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					16,
-					200,
-					50,
-					991.20849609375,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXSymbolsDataSource_SymbolTypeIconID,
-					PBXSymbolsDataSource_SymbolNameID,
-					PBXSymbolsDataSource_SymbolTypeID,
-					PBXSymbolsDataSource_ReferenceNameID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.XCSCMDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					20,
-					1027,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_SCM_ColumnID,
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					1011,
-					60,
-					20,
-					48,
-					43,
-					43,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXTargetDataSource_PrimaryAttribute,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-				);
-			};
-			PBXPerProjectTemplateStateSaveDate = 251765187;
-			PBXWorkspaceStateSaveDate = 251765187;
-		};
-		perUserProjectItems = {
-			341D12800F01A1C70095C69B /* PBXTextBookmark */ = 341D12800F01A1C70095C69B /* PBXTextBookmark */;
-			341D12900F01A5D90095C69B /* PBXTextBookmark */ = 341D12900F01A5D90095C69B /* PBXTextBookmark */;
-			341D12910F01A5D90095C69B /* PBXTextBookmark */ = 341D12910F01A5D90095C69B /* PBXTextBookmark */;
-			341D12920F01A5D90095C69B /* PBXTextBookmark */ = 341D12920F01A5D90095C69B /* PBXTextBookmark */;
-			341D12930F01A5D90095C69B /* PBXTextBookmark */ = 341D12930F01A5D90095C69B /* PBXTextBookmark */;
-			341D12940F01A5D90095C69B /* PBXTextBookmark */ = 341D12940F01A5D90095C69B /* PBXTextBookmark */;
-			341D12950F01A5D90095C69B /* PBXTextBookmark */ = 341D12950F01A5D90095C69B /* PBXTextBookmark */;
-			341D12960F01A5D90095C69B /* PBXTextBookmark */ = 341D12960F01A5D90095C69B /* PBXTextBookmark */;
-			341D12970F01A5D90095C69B /* PBXTextBookmark */ = 341D12970F01A5D90095C69B /* PBXTextBookmark */;
-			341D12980F01A5D90095C69B /* PBXTextBookmark */ = 341D12980F01A5D90095C69B /* PBXTextBookmark */;
-			341D12990F01A5D90095C69B /* PBXTextBookmark */ = 341D12990F01A5D90095C69B /* PBXTextBookmark */;
-			341D129A0F01A5D90095C69B /* PBXTextBookmark */ = 341D129A0F01A5D90095C69B /* PBXTextBookmark */;
-			341D129B0F01A5D90095C69B /* PBXTextBookmark */ = 341D129B0F01A5D90095C69B /* PBXTextBookmark */;
-			341D129C0F01A5D90095C69B /* PBXTextBookmark */ = 341D129C0F01A5D90095C69B /* PBXTextBookmark */;
-			341D12A20F01A8670095C69B /* PBXTextBookmark */ = 341D12A20F01A8670095C69B /* PBXTextBookmark */;
-			341D12A30F01A8670095C69B /* PBXTextBookmark */ = 341D12A30F01A8670095C69B /* PBXTextBookmark */;
-			341D12A50F01A87A0095C69B /* PBXTextBookmark */ = 341D12A50F01A87A0095C69B /* PBXTextBookmark */;
-			341D12B20F01A9200095C69B /* PBXTextBookmark */ = 341D12B20F01A9200095C69B /* PBXTextBookmark */;
-			341D12B40F01A9380095C69B /* PBXTextBookmark */ = 341D12B40F01A9380095C69B /* PBXTextBookmark */;
-			341D12B70F01A9420095C69B /* PBXTextBookmark */ = 341D12B70F01A9420095C69B /* PBXTextBookmark */;
-			341D12B80F01A9420095C69B /* PBXTextBookmark */ = 341D12B80F01A9420095C69B /* PBXTextBookmark */;
-			341D12B90F01A9420095C69B /* PBXTextBookmark */ = 341D12B90F01A9420095C69B /* PBXTextBookmark */;
-			341D12BA0F01A9420095C69B /* PBXTextBookmark */ = 341D12BA0F01A9420095C69B /* PBXTextBookmark */;
-			341D12BB0F01A9420095C69B /* PBXTextBookmark */ = 341D12BB0F01A9420095C69B /* PBXTextBookmark */;
-			341D12BC0F01A9420095C69B /* PBXTextBookmark */ = 341D12BC0F01A9420095C69B /* PBXTextBookmark */;
-			341D12BD0F01A9420095C69B /* PBXTextBookmark */ = 341D12BD0F01A9420095C69B /* PBXTextBookmark */;
-			341D12C20F01B0D60095C69B /* PBXTextBookmark */ = 341D12C20F01B0D60095C69B /* PBXTextBookmark */;
-			341D12C30F01B0D60095C69B /* PBXTextBookmark */ = 341D12C30F01B0D60095C69B /* PBXTextBookmark */;
-			341D12C40F01B0D60095C69B /* PBXTextBookmark */ = 341D12C40F01B0D60095C69B /* PBXTextBookmark */;
-			341D12C50F01B0D60095C69B /* PBXTextBookmark */ = 341D12C50F01B0D60095C69B /* PBXTextBookmark */;
-			341D12C60F01B0D60095C69B /* PBXTextBookmark */ = 341D12C60F01B0D60095C69B /* PBXTextBookmark */;
-			341D12C70F01B0D60095C69B /* PBXTextBookmark */ = 341D12C70F01B0D60095C69B /* PBXTextBookmark */;
-			341D12C80F01B0D60095C69B /* PBXTextBookmark */ = 341D12C80F01B0D60095C69B /* PBXTextBookmark */;
-			341D12C90F01B0D60095C69B /* PBXTextBookmark */ = 341D12C90F01B0D60095C69B /* PBXTextBookmark */;
-			341D12CA0F01B0D60095C69B /* PBXTextBookmark */ = 341D12CA0F01B0D60095C69B /* PBXTextBookmark */;
-			341D12CB0F01B0D60095C69B /* PBXTextBookmark */ = 341D12CB0F01B0D60095C69B /* PBXTextBookmark */;
-			341D12CD0F01B0DD0095C69B /* PBXTextBookmark */ = 341D12CD0F01B0DD0095C69B /* PBXTextBookmark */;
-			341D12D20F01B1CC0095C69B /* PlistBookmark */ = 341D12D20F01B1CC0095C69B /* PlistBookmark */;
-			341D12D30F01B1CC0095C69B /* PBXTextBookmark */ = 341D12D30F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12D40F01B1CC0095C69B /* PBXTextBookmark */ = 341D12D40F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12D50F01B1CC0095C69B /* PBXTextBookmark */ = 341D12D50F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12D60F01B1CC0095C69B /* PBXTextBookmark */ = 341D12D60F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12D70F01B1CC0095C69B /* PBXTextBookmark */ = 341D12D70F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12D80F01B1CC0095C69B /* PBXTextBookmark */ = 341D12D80F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12D90F01B1CC0095C69B /* PBXTextBookmark */ = 341D12D90F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12DA0F01B1CC0095C69B /* PlistBookmark */ = 341D12DA0F01B1CC0095C69B /* PlistBookmark */;
-			341D12DB0F01B1CC0095C69B /* PBXTextBookmark */ = 341D12DB0F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12DC0F01B1CC0095C69B /* PBXTextBookmark */ = 341D12DC0F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12DD0F01B1CC0095C69B /* PBXTextBookmark */ = 341D12DD0F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12DE0F01B1CC0095C69B /* PBXTextBookmark */ = 341D12DE0F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12DF0F01B1CC0095C69B /* PBXTextBookmark */ = 341D12DF0F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E00F01B1CC0095C69B /* PBXTextBookmark */ = 341D12E00F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E10F01B1CC0095C69B /* PBXTextBookmark */ = 341D12E10F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E20F01B1CC0095C69B /* PBXTextBookmark */ = 341D12E20F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E30F01B1CC0095C69B /* PBXTextBookmark */ = 341D12E30F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E40F01B1CC0095C69B /* PBXTextBookmark */ = 341D12E40F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E50F01B1CC0095C69B /* PBXTextBookmark */ = 341D12E50F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E60F01B1CC0095C69B /* PBXTextBookmark */ = 341D12E60F01B1CC0095C69B /* PBXTextBookmark */;
-			341D12E80F01B2820095C69B /* PBXTextBookmark */ = 341D12E80F01B2820095C69B /* PBXTextBookmark */;
-			341D12E90F01B2820095C69B /* PBXTextBookmark */ = 341D12E90F01B2820095C69B /* PBXTextBookmark */;
-			341D12EA0F01B2820095C69B /* PBXTextBookmark */ = 341D12EA0F01B2820095C69B /* PBXTextBookmark */;
-			341D12EB0F01B2820095C69B /* PBXTextBookmark */ = 341D12EB0F01B2820095C69B /* PBXTextBookmark */;
-			341D12EC0F01B2820095C69B /* PBXTextBookmark */ = 341D12EC0F01B2820095C69B /* PBXTextBookmark */;
-			341D12ED0F01B2820095C69B /* PBXTextBookmark */ = 341D12ED0F01B2820095C69B /* PBXTextBookmark */;
-			341D12EE0F01B2820095C69B /* PBXTextBookmark */ = 341D12EE0F01B2820095C69B /* PBXTextBookmark */;
-			341D12F00F01B29C0095C69B /* PBXTextBookmark */ = 341D12F00F01B29C0095C69B /* PBXTextBookmark */;
-			341D12F20F01B2C10095C69B /* PBXTextBookmark */ = 341D12F20F01B2C10095C69B /* PBXTextBookmark */;
-			341D12F40F01B2CA0095C69B /* PBXTextBookmark */ = 341D12F40F01B2CA0095C69B /* PBXTextBookmark */;
-			341D12F60F01B2E00095C69B /* PBXTextBookmark */ = 341D12F60F01B2E00095C69B /* PBXTextBookmark */;
-			341D12F80F01B3110095C69B /* PBXTextBookmark */ = 341D12F80F01B3110095C69B /* PBXTextBookmark */;
-			341D12FA0F01B3350095C69B /* PBXTextBookmark */ = 341D12FA0F01B3350095C69B /* PBXTextBookmark */;
-			341D12FC0F01B3520095C69B /* PBXTextBookmark */ = 341D12FC0F01B3520095C69B /* PBXTextBookmark */;
-			341D12FE0F01B3670095C69B /* PBXTextBookmark */ = 341D12FE0F01B3670095C69B /* PBXTextBookmark */;
-			341D13000F01B3860095C69B /* PBXTextBookmark */ = 341D13000F01B3860095C69B /* PBXTextBookmark */;
-			341D13020F01B4650095C69B /* PBXTextBookmark */ = 341D13020F01B4650095C69B /* PBXTextBookmark */;
-			341D13030F01B4650095C69B /* PlistBookmark */ = 341D13030F01B4650095C69B /* PlistBookmark */;
-			341D13040F01B4650095C69B /* PBXTextBookmark */ = 341D13040F01B4650095C69B /* PBXTextBookmark */;
-			341D13050F01B4650095C69B /* PBXTextBookmark */ = 341D13050F01B4650095C69B /* PBXTextBookmark */;
-			341D13060F01B4650095C69B /* PBXTextBookmark */ = 341D13060F01B4650095C69B /* PBXTextBookmark */;
-			341D13070F01B4650095C69B /* PlistBookmark */ = 341D13070F01B4650095C69B /* PlistBookmark */;
-			341D13080F01B4650095C69B /* PBXTextBookmark */ = 341D13080F01B4650095C69B /* PBXTextBookmark */;
-			341D13090F01B4650095C69B /* PBXTextBookmark */ = 341D13090F01B4650095C69B /* PBXTextBookmark */;
-			341D130A0F01B4650095C69B /* PBXTextBookmark */ = 341D130A0F01B4650095C69B /* PBXTextBookmark */;
-			34865A1D0EE7F0B000716A66 = 34865A1D0EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A210EE7F0B000716A66 = 34865A210EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A230EE7F0B000716A66 = 34865A230EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A250EE7F0B000716A66 = 34865A250EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A260EE7F0B000716A66 = 34865A260EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A280EE7F0B000716A66 = 34865A280EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A2A0EE7F0B000716A66 = 34865A2A0EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A2B0EE7F0B000716A66 = 34865A2B0EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A2D0EE7F0B000716A66 = 34865A2D0EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A2F0EE7F0B000716A66 = 34865A2F0EE7F0B000716A66 /* PBXTextBookmark */;
-			34865A4F0EE7F25E00716A66 = 34865A4F0EE7F25E00716A66 /* PBXTextBookmark */;
-			34865A5A0EE7F29C00716A66 = 34865A5A0EE7F29C00716A66 /* PBXTextBookmark */;
-			34865A630EE7FB7600716A66 = 34865A630EE7FB7600716A66 /* PBXTextBookmark */;
-			34865A650EE7FB7600716A66 = 34865A650EE7FB7600716A66 /* PBXTextBookmark */;
-			34865A660EE7FB7600716A66 = 34865A660EE7FB7600716A66 /* PBXTextBookmark */;
-			34865A670EE7FB7600716A66 = 34865A670EE7FB7600716A66 /* PBXTextBookmark */;
-			34865A680EE7FB7600716A66 = 34865A680EE7FB7600716A66 /* PBXTextBookmark */;
-			34865A6C0EE7FBA600716A66 = 34865A6C0EE7FBA600716A66 /* PBXTextBookmark */;
-			34865A750EE7FC4600716A66 = 34865A750EE7FC4600716A66 /* PBXTextBookmark */;
-			34865A760EE7FC4600716A66 = 34865A760EE7FC4600716A66 /* PBXTextBookmark */;
-			34865A770EE7FC4600716A66 = 34865A770EE7FC4600716A66 /* PBXTextBookmark */;
-			34865A780EE7FC4600716A66 = 34865A780EE7FC4600716A66 /* PBXTextBookmark */;
-			34865A790EE7FC4600716A66 = 34865A790EE7FC4600716A66 /* PBXTextBookmark */;
-			34865A850EE7FC8D00716A66 = 34865A850EE7FC8D00716A66 /* PBXTextBookmark */;
-			34865A860EE7FC8D00716A66 = 34865A860EE7FC8D00716A66 /* PBXTextBookmark */;
-			34865A890EE7FD2000716A66 = 34865A890EE7FD2000716A66 /* PBXTextBookmark */;
-			34865A8B0EE7FD2000716A66 = 34865A8B0EE7FD2000716A66 /* PBXTextBookmark */;
-			34865A9B0EE7FE0700716A66 = 34865A9B0EE7FE0700716A66 /* PBXTextBookmark */;
-			34865A9C0EE7FE0700716A66 = 34865A9C0EE7FE0700716A66 /* PBXTextBookmark */;
-			34865ACA0EE7FEED00716A66 = 34865ACA0EE7FEED00716A66 /* PBXTextBookmark */;
-			34865AE10EE7FF8A00716A66 = 34865AE10EE7FF8A00716A66 /* PBXTextBookmark */;
-			34865AE60EE8002400716A66 = 34865AE60EE8002400716A66 /* PBXTextBookmark */;
-			34865AE80EE8002400716A66 = 34865AE80EE8002400716A66 /* PBXTextBookmark */;
-			34865AE90EE8002400716A66 = 34865AE90EE8002400716A66 /* PBXTextBookmark */;
-			34865AEA0EE8002400716A66 = 34865AEA0EE8002400716A66 /* PBXTextBookmark */;
-			34865AF80EE800C900716A66 = 34865AF80EE800C900716A66 /* PBXTextBookmark */;
-			34865AF90EE800C900716A66 = 34865AF90EE800C900716A66 /* PBXTextBookmark */;
-			34865AFA0EE800C900716A66 = 34865AFA0EE800C900716A66 /* PBXTextBookmark */;
-			34865B090EE803F100716A66 = 34865B090EE803F100716A66 /* PBXTextBookmark */;
-		};
-		sourceControlManager = 347710780E8BD7BA0051DFFD /* Source Control */;
-		userBuildSettings = {
-		};
-	};
-	29B97316FDCFA39411CA2CEA /* main.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {887, 238}}";
-			sepNavSelRange = "{270, 0}";
-			sepNavVisRange = "{0, 369}";
-		};
-	};
-	32CA4F630368D1EE00C91783 /* FixMyStreet_Prefix.pch */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {758, 761}}";
-			sepNavSelRange = "{185, 0}";
-			sepNavVisRange = "{0, 230}";
-		};
-	};
-	341D12800F01A1C70095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3316;
-		vrLoc = 5040;
-	};
-	341D12900F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 128";
-		rLen = 0;
-		rLoc = 4228;
-		rType = 0;
-		vrLen = 1234;
-		vrLoc = 2294;
-	};
-	341D12910F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3316;
-		vrLoc = 5040;
-	};
-	341D12920F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 39";
-		rLen = 0;
-		rLoc = 1191;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	341D12930F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 280";
-		rLen = 0;
-		rLoc = 10033;
-		rType = 0;
-		vrLen = 2173;
-		vrLoc = 8896;
-	};
-	341D12940F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3316;
-		vrLoc = 5040;
-	};
-	341D12950F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 128";
-		rLen = 0;
-		rLoc = 4228;
-		rType = 0;
-		vrLen = 1192;
-		vrLoc = 2336;
-	};
-	341D12960F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 88";
-		rLen = 21;
-		rLoc = 2725;
-		rType = 0;
-		vrLen = 2308;
-		vrLoc = 2292;
-	};
-	341D12970F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 128";
-		rLen = 0;
-		rLoc = 4228;
-		rType = 0;
-		vrLen = 1234;
-		vrLoc = 2294;
-	};
-	341D12980F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 88";
-		rLen = 21;
-		rLoc = 2725;
-		rType = 0;
-		vrLen = 2249;
-		vrLoc = 2292;
-	};
-	341D12990F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3316;
-		vrLoc = 5040;
-	};
-	341D129A0F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 280";
-		rLen = 0;
-		rLoc = 10033;
-		rType = 0;
-		vrLen = 2145;
-		vrLoc = 8924;
-	};
-	341D129B0F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 39";
-		rLen = 0;
-		rLoc = 1191;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	341D129C0F01A5D90095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 196";
-		rLen = 0;
-		rLoc = 6940;
-		rType = 0;
-		vrLen = 2507;
-		vrLoc = 6080;
-	};
-	341D12A20F01A8670095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 196";
-		rLen = 0;
-		rLoc = 6940;
-		rType = 0;
-		vrLen = 2535;
-		vrLoc = 6080;
-	};
-	341D12A30F01A8670095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 196";
-		rLen = 0;
-		rLoc = 6940;
-		rType = 0;
-		vrLen = 2285;
-		vrLoc = 2668;
-	};
-	341D12A50F01A87A0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 196";
-		rLen = 0;
-		rLoc = 6940;
-		rType = 0;
-		vrLen = 2285;
-		vrLoc = 2668;
-	};
-	341D12B20F01A9200095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		rLen = 7;
-		rLoc = 5464;
-		rType = 0;
-	};
-	341D12B40F01A9380095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 155";
-		rLen = 7;
-		rLoc = 5464;
-		rType = 0;
-		vrLen = 1068;
-		vrLoc = 4953;
-	};
-	341D12B70F01A9420095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 39";
-		rLen = 0;
-		rLoc = 1191;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	341D12B80F01A9420095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 200";
-		rLen = 0;
-		rLoc = 7228;
-		rType = 0;
-		vrLen = 2225;
-		vrLoc = 6693;
-	};
-	341D12B90F01A9420095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		rLen = 7;
-		rLoc = 3664;
-		rType = 0;
-	};
-	341D12BA0F01A9420095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 127";
-		rLen = 0;
-		rLoc = 4481;
-		rType = 0;
-		vrLen = 2264;
-		vrLoc = 6693;
-	};
-	341D12BB0F01A9420095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 39";
-		rLen = 0;
-		rLoc = 1191;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	341D12BC0F01A9420095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 200";
-		rLen = 0;
-		rLoc = 7228;
-		rType = 0;
-		vrLen = 2225;
-		vrLoc = 6693;
-	};
-	341D12BD0F01A9420095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 102";
-		rLen = 7;
-		rLoc = 3664;
-		rType = 0;
-		vrLen = 1227;
-		vrLoc = 2294;
-	};
-	341D12C20F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 21";
-		rLen = 0;
-		rLoc = 651;
-		rType = 0;
-		vrLen = 765;
-		vrLoc = 165;
-	};
-	341D12C30F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 131";
-		rLen = 0;
-		rLoc = 4318;
-		rType = 0;
-		vrLen = 560;
-		vrLoc = 2961;
-	};
-	341D12C40F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		rLen = 7;
-		rLoc = 475;
-		rType = 0;
-	};
-	341D12C50F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 155";
-		rLen = 7;
-		rLoc = 5464;
-		rType = 0;
-		vrLen = 1068;
-		vrLoc = 4953;
-	};
-	341D12C60F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 102";
-		rLen = 0;
-		rLoc = 3671;
-		rType = 0;
-		vrLen = 616;
-		vrLoc = 2417;
-	};
-	341D12C70F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 205";
-		rLen = 0;
-		rLoc = 7595;
-		rType = 0;
-		vrLen = 1318;
-		vrLoc = 6847;
-	};
-	341D12C80F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 21";
-		rLen = 0;
-		rLoc = 651;
-		rType = 0;
-		vrLen = 765;
-		vrLoc = 165;
-	};
-	341D12C90F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 255";
-		rLen = 0;
-		rLoc = 9151;
-		rType = 0;
-		vrLen = 639;
-		vrLoc = 8876;
-	};
-	341D12CA0F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 131";
-		rLen = 0;
-		rLoc = 4318;
-		rType = 0;
-		vrLen = 560;
-		vrLoc = 2961;
-	};
-	341D12CB0F01B0D60095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 20";
-		rLen = 0;
-		rLoc = 482;
-		rType = 0;
-		vrLen = 675;
-		vrLoc = 0;
-	};
-	341D12CD0F01B0DD0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 104";
-		rLen = 0;
-		rLoc = 3724;
-		rType = 0;
-		vrLen = 1227;
-		vrLoc = 2294;
-	};
-	341D12D20F01B1CC0095C69B /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 8D1107310486CEB800E47090 /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-		);
-		name = /Users/matthew/Projects/mySociety/iPhone/FixMyStreet/Info.plist;
-		rLen = 0;
-		rLoc = 2147483647;
-	};
-	341D12D30F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
-		name = "SettingsViewController.h: 24";
-		rLen = 0;
-		rLoc = 453;
-		rType = 0;
-		vrLen = 458;
-		vrLoc = 0;
-	};
-	341D12D40F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021B0E93CDA200D716CB /* MyCLController.h */;
-		name = "MyCLController.h: 41";
-		rLen = 0;
-		rLoc = 2245;
-		rType = 0;
-		vrLen = 1975;
-		vrLoc = 1415;
-	};
-	341D12D50F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 54";
-		rLen = 163;
-		rLoc = 1463;
-		rType = 0;
-		vrLen = 2076;
-		vrLoc = 762;
-	};
-	341D12D60F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 205";
-		rLen = 6;
-		rLoc = 7524;
-		rType = 0;
-		vrLen = 2316;
-		vrLoc = 6467;
-	};
-	341D12D70F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 48";
-		rLen = 0;
-		rLoc = 1480;
-		rType = 0;
-		vrLen = 1618;
-		vrLoc = 35;
-	};
-	341D12D80F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 108";
-		rLen = 0;
-		rLoc = 3809;
-		rType = 0;
-		vrLen = 1606;
-		vrLoc = 0;
-	};
-	341D12D90F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 167";
-		rLen = 6;
-		rLoc = 5463;
-		rType = 0;
-		vrLen = 2047;
-		vrLoc = 339;
-	};
-	341D12DA0F01B1CC0095C69B /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 8D1107310486CEB800E47090 /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-		);
-		name = /Users/matthew/Projects/mySociety/iPhone/FixMyStreet/Info.plist;
-		rLen = 0;
-		rLoc = 2147483647;
-	};
-	341D12DB0F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */;
-		name = "SettingsViewController.h: 24";
-		rLen = 0;
-		rLoc = 453;
-		rType = 0;
-		vrLen = 458;
-		vrLoc = 0;
-	};
-	341D12DC0F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 15";
-		rLen = 6;
-		rLoc = 324;
-		rType = 0;
-		vrLen = 1723;
-		vrLoc = 198;
-	};
-	341D12DD0F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 335";
-		rLen = 6;
-		rLoc = 12258;
-		rType = 0;
-		vrLen = 2005;
-		vrLoc = 10785;
-	};
-	341D12DE0F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 15";
-		rLen = 6;
-		rLoc = 324;
-		rType = 0;
-		vrLen = 1921;
-		vrLoc = 1122;
-	};
-	341D12DF0F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 108";
-		rLen = 0;
-		rLoc = 3809;
-		rType = 0;
-		vrLen = 1719;
-		vrLoc = 334;
-	};
-	341D12E00F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021B0E93CDA200D716CB /* MyCLController.h */;
-		name = "MyCLController.h: 41";
-		rLen = 0;
-		rLoc = 2245;
-		rType = 0;
-		vrLen = 1975;
-		vrLoc = 1415;
-	};
-	341D12E10F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 41";
-		rLen = 47;
-		rLoc = 1195;
-		rType = 0;
-		vrLen = 2076;
-		vrLoc = 762;
-	};
-	341D12E20F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 50";
-		rLen = 0;
-		rLoc = 1543;
-		rType = 0;
-		vrLen = 1293;
-		vrLoc = 1173;
-	};
-	341D12E30F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 54";
-		rLen = 163;
-		rLoc = 1463;
-		rType = 0;
-		vrLen = 2076;
-		vrLoc = 762;
-	};
-	341D12E40F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 48";
-		rLen = 0;
-		rLoc = 1480;
-		rType = 0;
-		vrLen = 1632;
-		vrLoc = 35;
-	};
-	341D12E50F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 205";
-		rLen = 6;
-		rLoc = 7524;
-		rType = 0;
-		vrLen = 2316;
-		vrLoc = 6467;
-	};
-	341D12E60F01B1CC0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 48";
-		rLen = 0;
-		rLoc = 1480;
-		rType = 0;
-		vrLen = 1632;
-		vrLoc = 35;
-	};
-	341D12E80F01B2820095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 63";
-		rLen = 3255;
-		rLoc = 1732;
-		rType = 0;
-		vrLen = 1926;
-		vrLoc = 3692;
-	};
-	341D12E90F01B2820095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 61";
-		rLen = 0;
-		rLoc = 1794;
-		rType = 0;
-		vrLen = 1347;
-		vrLoc = 1173;
-	};
-	341D12EA0F01B2820095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 48";
-		rLen = 0;
-		rLoc = 1480;
-		rType = 0;
-		vrLen = 1632;
-		vrLoc = 35;
-	};
-	341D12EB0F01B2820095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 54";
-		rLen = 163;
-		rLoc = 1463;
-		rType = 0;
-		vrLen = 2002;
-		vrLoc = 762;
-	};
-	341D12EC0F01B2820095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 61";
-		rLen = 0;
-		rLoc = 1794;
-		rType = 0;
-		vrLen = 1347;
-		vrLoc = 1173;
-	};
-	341D12ED0F01B2820095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */;
-		name = "SettingsViewController.m: 63";
-		rLen = 3255;
-		rLoc = 1732;
-		rType = 0;
-		vrLen = 1926;
-		vrLoc = 3692;
-	};
-	341D12EE0F01B2820095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 84";
-		rLen = 0;
-		rLoc = 2620;
-		rType = 0;
-		vrLen = 1442;
-		vrLoc = 1944;
-	};
-	341D12F00F01B29C0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 82";
-		rLen = 0;
-		rLoc = 2612;
-		rType = 0;
-		vrLen = 1597;
-		vrLoc = 1673;
-	};
-	341D12F20F01B2C10095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 69";
-		rLen = 0;
-		rLoc = 1965;
-		rType = 0;
-		vrLen = 1597;
-		vrLoc = 1673;
-	};
-	341D12F40F01B2CA0095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 69";
-		rLen = 0;
-		rLoc = 1965;
-		rType = 0;
-		vrLen = 1597;
-		vrLoc = 1673;
-	};
-	341D12F60F01B2E00095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 65";
-		rLen = 0;
-		rLoc = 1832;
-		rType = 0;
-		vrLen = 1568;
-		vrLoc = 1529;
-	};
-	341D12F80F01B3110095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 76";
-		rLen = 0;
-		rLoc = 2527;
-		rType = 0;
-		vrLen = 1551;
-		vrLoc = 1529;
-	};
-	341D12FA0F01B3350095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 76";
-		rLen = 0;
-		rLoc = 2527;
-		rType = 0;
-		vrLen = 1673;
-		vrLoc = 1529;
-	};
-	341D12FC0F01B3520095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 76";
-		rLen = 0;
-		rLoc = 2495;
-		rType = 0;
-		vrLen = 1551;
-		vrLoc = 1529;
-	};
-	341D12FE0F01B3670095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 76";
-		rLen = 0;
-		rLoc = 2495;
-		rType = 0;
-		vrLen = 1551;
-		vrLoc = 1529;
-	};
-	341D13000F01B3860095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 76";
-		rLen = 0;
-		rLoc = 2527;
-		rType = 0;
-		vrLen = 1554;
-		vrLoc = 1529;
-	};
-	341D13020F01B4650095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 76";
-		rLen = 0;
-		rLoc = 2527;
-		rType = 0;
-		vrLen = 1665;
-		vrLoc = 1529;
-	};
-	341D13030F01B4650095C69B /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 8D1107310486CEB800E47090 /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-		);
-		name = /Users/matthew/Projects/mySociety/iPhone/FixMyStreet/Info.plist;
-		rLen = 0;
-		rLoc = 2147483647;
-	};
-	341D13040F01B4650095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3320;
-		vrLoc = 5040;
-	};
-	341D13050F01B4650095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 39";
-		rLen = 0;
-		rLoc = 1191;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	341D13060F01B4650095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		name = "EditSubjectViewController.m: 76";
-		rLen = 0;
-		rLoc = 2527;
-		rType = 0;
-		vrLen = 1665;
-		vrLoc = 1529;
-	};
-	341D13070F01B4650095C69B /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 8D1107310486CEB800E47090 /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-		);
-		name = /Users/matthew/Projects/mySociety/iPhone/FixMyStreet/Info.plist;
-		rLen = 0;
-		rLoc = 2147483647;
-	};
-	341D13080F01B4650095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 39";
-		rLen = 0;
-		rLoc = 1191;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	341D13090F01B4650095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3320;
-		vrLoc = 5040;
-	};
-	341D130A0F01B4650095C69B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 39";
-		rLen = 0;
-		rLoc = 1191;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	3442AA200EE575BA000B191D /* Reachability.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 1750}}";
-			sepNavSelRange = "{1145, 0}";
-			sepNavVisRange = "{0, 2615}";
-		};
-	};
-	3442AA210EE575BA000B191D /* Reachability.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 8148}}";
-			sepNavSelRange = "{11113, 0}";
-			sepNavVisRange = "{21184, 1815}";
-		};
-	};
-	344E0D540E91440500483FD6 /* imageCell.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 756}}";
-			sepNavSelRange = "{264, 0}";
-			sepNavVisRange = "{0, 412}";
-			sepNavWindowFrame = "{{15, 615}, {750, 558}}";
-		};
-	};
-	344E0D550E91440500483FD6 /* imageCell.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {758, 980}}";
-			sepNavSelRange = "{408, 0}";
-			sepNavVisRange = "{174, 1898}";
-			sepNavWindowFrame = "{{38, 594}, {750, 558}}";
-		};
-	};
-	344E0E5B0E918B1000483FD6 /* Report.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {758, 761}}";
-			sepNavSelRange = "{243, 0}";
-			sepNavVisRange = "{0, 248}";
-		};
-	};
-	344E0E5C0E918B1000483FD6 /* Report.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 854}}";
-			sepNavSelRange = "{83, 0}";
-			sepNavVisRange = "{0, 1077}";
-			sepNavWindowFrame = "{{84, 552}, {750, 558}}";
-		};
-	};
-	345577AE0EAE24AF008C5D7F /* EditSubjectViewController.m:152 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		functionName = "-updateSummary:";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 152;
-		location = FixMyStreet;
-		modificationTime = 246888798.999875;
-		state = 2;
-	};
-	345577D30EAE262B008C5D7F /* EditSubjectViewController.m:152 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		functionName = "-updateSummary:";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 152;
-		location = FixMyStreet;
-		modificationTime = 246888798.999893;
-		state = 2;
-	};
-	345577D50EAE262C008C5D7F /* EditSubjectViewController.m:152 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */;
-		functionName = "-updateSummary:";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 152;
-		location = FixMyStreet;
-		modificationTime = 246888798.9999011;
-		state = 2;
-	};
-	347710680E8BD7AA0051DFFD /* FixMyStreet */ = {
-		isa = PBXExecutable;
-		activeArgIndices = (
-		);
-		argumentStrings = (
-		);
-		autoAttachOnCrash = 1;
-		breakpointsEnabled = 0;
-		configStateDict = {
-		};
-		customDataFormattersEnabled = 1;
-		debuggerPlugin = GDBDebugging;
-		disassemblyDisplayState = 0;
-		dylibVariantSuffix = "";
-		enableDebugStr = 1;
-		environmentEntries = (
-		);
-		executableSystemSymbolLevel = 0;
-		executableUserSymbolLevel = 0;
-		libgmallocEnabled = 0;
-		name = FixMyStreet;
-		savedGlobals = {
-		};
-		sourceDirectories = (
-		);
-		variableFormatDictionary = {
-		};
-	};
-	347710780E8BD7BA0051DFFD /* Source Control */ = {
-		isa = PBXSourceControlManager;
-		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 0;
-		scmConfiguration = {
-			repositoryName = mySociety;
-		};
-	};
-	347710790E8BD7BA0051DFFD /* Code sense */ = {
-		isa = PBXCodeSenseManager;
-		indexTemplatePath = "";
-	};
-	347712720E8D367F0051DFFD /* InputTableViewController.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 770}}";
-			sepNavSelRange = "{1191, 0}";
-			sepNavVisRange = "{0, 1330}";
-			sepNavWindowFrame = "{{153, 489}, {750, 558}}";
-		};
-	};
-	347712730E8D367F0051DFFD /* InputTableViewController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {752, 5250}}";
-			sepNavSelRange = "{482, 0}";
-			sepNavVisRange = "{0, 676}";
-			sepNavWindowFrame = "{{1082, 467}, {750, 558}}";
-		};
-	};
-	347A021B0E93CDA200D716CB /* MyCLController.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 1162}}";
-			sepNavSelRange = "{2245, 0}";
-			sepNavVisRange = "{1415, 1975}";
-			sepNavWindowFrame = "{{15, 94}, {738, 1079}}";
-		};
-	};
-	347A021C0E93CDA200D716CB /* MyCLController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {752, 2492}}";
-			sepNavSelRange = "{4537, 12}";
-			sepNavVisRange = "{3688, 1243}";
-			sepNavWindowFrame = "{{15, 94}, {738, 1079}}";
-		};
-	};
-	3481BD1F0EACEE3300C78F66 /* EditingTableViewCell.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 756}}";
-			sepNavSelRange = "{239, 11}";
-			sepNavVisRange = "{0, 325}";
-		};
-	};
-	3481BD200EACEE3300C78F66 /* EditingTableViewCell.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 756}}";
-			sepNavSelRange = "{437, 11}";
-			sepNavVisRange = "{0, 1099}";
-		};
-	};
-	3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 770}}";
-			sepNavSelRange = "{453, 0}";
-			sepNavVisRange = "{0, 458}";
-		};
-	};
-	3481BD500EACF81D00C78F66 /* SettingsViewController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 2870}}";
-			sepNavSelRange = "{1732, 3255}";
-			sepNavVisRange = "{3692, 1926}";
-			sepNavWindowFrame = "{{15, 94}, {738, 1079}}";
-		};
-	};
-	34865A1D0EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3442AA210EE575BA000B191D /* Reachability.m */;
-		name = "Reachability.m: 255";
-		rLen = 0;
-		rLoc = 11113;
-		rType = 0;
-		vrLen = 1815;
-		vrLoc = 21184;
-	};
-	34865A210EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 40";
-		rLen = 0;
-		rLoc = 1207;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	34865A230EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 110";
-		rLen = 0;
-		rLoc = 5107;
-		rType = 0;
-		vrLen = 2775;
-		vrLoc = 4393;
-	};
-	34865A250EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 108";
-		rLen = 410;
-		rLoc = 4884;
-		rType = 0;
-		vrLen = 2775;
-		vrLoc = 4393;
-	};
-	34865A260EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 3442AA210EE575BA000B191D /* Reachability.m */;
-		name = "Reachability.m: 255";
-		rLen = 0;
-		rLoc = 11113;
-		rType = 0;
-		vrLen = 1815;
-		vrLoc = 21184;
-	};
-	34865A280EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 108";
-		rLen = 410;
-		rLoc = 4884;
-		rType = 0;
-		vrLen = 2775;
-		vrLoc = 4393;
-	};
-	34865A2A0EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021B0E93CDA200D716CB /* MyCLController.h */;
-		name = "MyCLController.h: 54";
-		rLen = 0;
-		rLoc = 2701;
-		rType = 0;
-		vrLen = 2104;
-		vrLoc = 1256;
-	};
-	34865A2B0EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021C0E93CDA200D716CB /* MyCLController.m */;
-		name = "MyCLController.m: 114";
-		rLen = 104;
-		rLoc = 4560;
-		rType = 0;
-		vrLen = 2087;
-		vrLoc = 3523;
-	};
-	34865A2D0EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021C0E93CDA200D716CB /* MyCLController.m */;
-		name = "MyCLController.m: 67";
-		rLen = 7;
-		rLoc = 2939;
-		rType = 0;
-		vrLen = 1629;
-		vrLoc = 2067;
-	};
-	34865A2F0EE7F0B000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712720E8D367F0051DFFD /* InputTableViewController.h */;
-		name = "InputTableViewController.h: 40";
-		rLen = 0;
-		rLoc = 1207;
-		rType = 0;
-		vrLen = 1330;
-		vrLoc = 0;
-	};
-	34865A4F0EE7F25E00716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 133";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3203;
-		vrLoc = 5225;
-	};
-	34865A5A0EE7F29C00716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 53";
-		rLen = 97;
-		rLoc = 1614;
-		rType = 0;
-		vrLen = 1932;
-		vrLoc = 676;
-	};
-	34865A630EE7FB7600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623240D0F684500981E51 /* FixMyStreetAppDelegate.h */;
-		name = "FixMyStreetAppDelegate.h: 15";
-		rLen = 0;
-		rLoc = 351;
-		rType = 0;
-		vrLen = 1201;
-		vrLoc = 0;
-	};
-	34865A650EE7FB7600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 214";
-		rLen = 0;
-		rLoc = 11513;
-		rType = 0;
-		vrLen = 2642;
-		vrLoc = 9336;
-	};
-	34865A660EE7FB7600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 80";
-		rLen = 0;
-		rLoc = 2369;
-		rType = 0;
-		vrLen = 1972;
-		vrLoc = 10487;
-	};
-	34865A670EE7FB7600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 212";
-		rLen = 0;
-		rLoc = 11187;
-		rType = 0;
-		vrLen = 2922;
-		vrLoc = 4806;
-	};
-	34865A680EE7FB7600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623240D0F684500981E51 /* FixMyStreetAppDelegate.h */;
-		name = "FixMyStreetAppDelegate.h: 15";
-		rLen = 0;
-		rLoc = 351;
-		rType = 0;
-		vrLen = 1201;
-		vrLoc = 0;
-	};
-	34865A6C0EE7FBA600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 213";
-		rLen = 0;
-		rLoc = 11207;
-		rType = 0;
-		vrLen = 2451;
-		vrLoc = 9564;
-	};
-	34865A750EE7FC4600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 287";
-		rLen = 74;
-		rLoc = 10478;
-		rType = 0;
-		vrLen = 2172;
-		vrLoc = 9392;
-	};
-	34865A760EE7FC4600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021C0E93CDA200D716CB /* MyCLController.m */;
-		name = "MyCLController.m: 120";
-		rLen = 0;
-		rLoc = 4895;
-		rType = 0;
-		vrLen = 2029;
-		vrLoc = 3494;
-	};
-	34865A770EE7FC4600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 213";
-		rLen = 0;
-		rLoc = 11207;
-		rType = 0;
-		vrLen = 3376;
-		vrLoc = 5278;
-	};
-	34865A780EE7FC4600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 287";
-		rLen = 74;
-		rLoc = 10478;
-		rType = 0;
-		vrLen = 2172;
-		vrLoc = 9392;
-	};
-	34865A790EE7FC4600716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 116";
-		rLen = 0;
-		rLoc = 5333;
-		rType = 0;
-		vrLen = 3431;
-		vrLoc = 5278;
-	};
-	34865A850EE7FC8D00716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021C0E93CDA200D716CB /* MyCLController.m */;
-		name = "MyCLController.m: 73";
-		rLen = 0;
-		rLoc = 3084;
-		rType = 0;
-		vrLen = 1791;
-		vrLoc = 1654;
-	};
-	34865A860EE7FC8D00716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 124";
-		rLen = 0;
-		rLoc = 5761;
-		rType = 0;
-		vrLen = 3080;
-		vrLoc = 5278;
-	};
-	34865A890EE7FD2000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021B0E93CDA200D716CB /* MyCLController.h */;
-		name = "MyCLController.h: 41";
-		rLen = 0;
-		rLoc = 2245;
-		rType = 0;
-		vrLen = 1898;
-		vrLoc = 1492;
-	};
-	34865A8B0EE7FD2000716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021B0E93CDA200D716CB /* MyCLController.h */;
-		name = "MyCLController.h: 41";
-		rLen = 0;
-		rLoc = 2245;
-		rType = 0;
-		vrLen = 1898;
-		vrLoc = 1492;
-	};
-	34865A9B0EE7FE0700716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 222";
-		rLen = 0;
-		rLoc = 8483;
-		rType = 0;
-		vrLen = 2043;
-		vrLoc = 7138;
-	};
-	34865A9C0EE7FE0700716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021C0E93CDA200D716CB /* MyCLController.m */;
-		name = "MyCLController.m: 45";
-		rLen = 0;
-		rLoc = 2478;
-		rType = 0;
-		vrLen = 1871;
-		vrLoc = 1577;
-	};
-	34865ACA0EE7FEED00716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3408;
-		vrLoc = 5225;
-	};
-	34865AE10EE7FF8A00716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 130";
-		rLen = 0;
-		rLoc = 4516;
-		rType = 0;
-		vrLen = 2072;
-		vrLoc = 4166;
-	};
-	34865AE60EE8002400716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021C0E93CDA200D716CB /* MyCLController.m */;
-		name = "MyCLController.m: 117";
-		rLen = 33;
-		rLoc = 4527;
-		rType = 0;
-		vrLen = 2059;
-		vrLoc = 3686;
-	};
-	34865AE80EE8002400716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 138";
-		rLen = 0;
-		rLoc = 6289;
-		rType = 0;
-		vrLen = 3133;
-		vrLoc = 5225;
-	};
-	34865AE90EE8002400716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 292";
-		rLen = 0;
-		rLoc = 10552;
-		rType = 0;
-		vrLen = 2414;
-		vrLoc = 9526;
-	};
-	34865AEA0EE8002400716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347A021C0E93CDA200D716CB /* MyCLController.m */;
-		name = "MyCLController.m: 117";
-		rLen = 33;
-		rLoc = 4527;
-		rType = 0;
-		vrLen = 2059;
-		vrLoc = 3686;
-	};
-	34865AF80EE800C900716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 293";
-		rLen = 0;
-		rLoc = 10556;
-		rType = 0;
-		vrLen = 2436;
-		vrLoc = 9526;
-	};
-	34865AF90EE800C900716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 138";
-		rLen = 0;
-		rLoc = 6289;
-		rType = 0;
-		vrLen = 3320;
-		vrLoc = 5040;
-	};
-	34865AFA0EE800C900716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */;
-		name = "InputTableViewController.m: 293";
-		rLen = 0;
-		rLoc = 10556;
-		rType = 0;
-		vrLen = 2436;
-		vrLoc = 9526;
-	};
-	34865B090EE803F100716A66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */;
-		name = "FixMyStreetAppDelegate.m: 134";
-		rLen = 0;
-		rLoc = 6093;
-		rType = 0;
-		vrLen = 3316;
-		vrLoc = 5040;
-	};
-	3499E5A30E95311A006F2DA2 /* .cvsignore */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {758, 761}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 6}";
-		};
-	};
-	349A561E0ECB07DF0091BE4F /* Default.png */ = {
-		uiCtxt = {
-			sepNavWindowFrame = "{{417, 72}, {738, 1079}}";
-		};
-	};
-	349AFEAC0E925AAA008E83C1 /* EditSubjectViewController.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 756}}";
-			sepNavSelRange = "{586, 0}";
-			sepNavVisRange = "{0, 592}";
-			sepNavWindowFrame = "{{15, 615}, {750, 558}}";
-		};
-	};
-	349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 2240}}";
-			sepNavSelRange = "{2527, 0}";
-			sepNavVisRange = "{1529, 1665}";
-			sepNavWindowFrame = "{{61, 573}, {750, 558}}";
-		};
-	};
-	34C17A8D0EB0CCD300768D1C /* AboutViewController.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 756}}";
-			sepNavSelRange = "{305, 0}";
-			sepNavVisRange = "{0, 311}";
-		};
-	};
-	34C17A8E0EB0CCD300768D1C /* AboutViewController.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1229, 756}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1270}";
-		};
-	};
-	8D1107310486CEB800E47090 /* Info.plist */ = {
-		uiCtxt = {
-			sepNavWindowFrame = "{{15, 94}, {738, 1079}}";
-		};
-	};
-}
diff --git a/iphone/FixMyStreet/FixMyStreet.xcodeproj/project.pbxproj b/iphone/FixMyStreet/FixMyStreet.xcodeproj/project.pbxproj
deleted file mode 100755
index 759918450..000000000
--- a/iphone/FixMyStreet/FixMyStreet.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,435 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1D3623260D0F684500981E51 /* FixMyStreetAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */; };
-		1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
-		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
-		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
-		28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
-		3442AA220EE575BA000B191D /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 3442AA210EE575BA000B191D /* Reachability.m */; };
-		3442AA8F0EE578CF000B191D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3442AA8E0EE578CF000B191D /* SystemConfiguration.framework */; };
-		344E0D560E91440500483FD6 /* imageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 344E0D550E91440500483FD6 /* imageCell.m */; };
-		344E0E5D0E918B1000483FD6 /* Report.m in Sources */ = {isa = PBXBuildFile; fileRef = 344E0E5C0E918B1000483FD6 /* Report.m */; };
-		347710950E8BDA9B0051DFFD /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 347710940E8BDA9B0051DFFD /* Icon.png */; };
-		347712740E8D367F0051DFFD /* InputTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347712730E8D367F0051DFFD /* InputTableViewController.m */; };
-		347A01810E93B6A600D716CB /* EditSubjectView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347A01800E93B6A600D716CB /* EditSubjectView.xib */; };
-		347A021D0E93CDA200D716CB /* MyCLController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347A021C0E93CDA200D716CB /* MyCLController.m */; };
-		347A02770E93D2A800D716CB /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 347A02760E93D2A800D716CB /* CoreLocation.framework */; };
-		3481BD210EACEE3300C78F66 /* EditingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3481BD200EACEE3300C78F66 /* EditingTableViewCell.m */; };
-		3481BD510EACF81D00C78F66 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3481BD500EACF81D00C78F66 /* SettingsViewController.m */; };
-		348C47900ECB12DE0030EF1C /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 348C478F0ECB12DE0030EF1C /* Entitlements.plist */; };
-		3499E5A40E95311A006F2DA2 /* .cvsignore in Resources */ = {isa = PBXBuildFile; fileRef = 3499E5A30E95311A006F2DA2 /* .cvsignore */; };
-		349A01770E928824008E83C1 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A01760E928824008E83C1 /* MainViewController.xib */; };
-		349A561F0ECB07DF0091BE4F /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 349A561E0ECB07DF0091BE4F /* Default.png */; };
-		349AFEAE0E925AAA008E83C1 /* EditSubjectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */; };
-		34C17A540EB0C69800768D1C /* mysociety.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C17A530EB0C69700768D1C /* mysociety.png */; };
-		34C17A5C0EB0C77E00768D1C /* AboutView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34C17A5B0EB0C77E00768D1C /* AboutView.xib */; };
-		34C17A8F0EB0CCD300768D1C /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C17A8E0EB0CCD300768D1C /* AboutViewController.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		1D3623240D0F684500981E51 /* FixMyStreetAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FixMyStreetAppDelegate.h; sourceTree = "<group>"; };
-		1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FixMyStreetAppDelegate.m; sourceTree = "<group>"; wrapsLines = 1; };
-		1D6058910D05DD3D006BFB54 /* FixMyStreet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FixMyStreet.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
-		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		32CA4F630368D1EE00C91783 /* FixMyStreet_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FixMyStreet_Prefix.pch; sourceTree = "<group>"; };
-		342F98AE0E951731006935E9 /* Root.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Root.plist; sourceTree = "<group>"; };
-		3442AA200EE575BA000B191D /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
-		3442AA210EE575BA000B191D /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
-		3442AA8E0EE578CF000B191D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		344E0D540E91440500483FD6 /* imageCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imageCell.h; path = Classes/imageCell.h; sourceTree = "<group>"; };
-		344E0D550E91440500483FD6 /* imageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = imageCell.m; path = Classes/imageCell.m; sourceTree = "<group>"; wrapsLines = 1; };
-		344E0E5B0E918B1000483FD6 /* Report.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Report.h; path = Classes/Report.h; sourceTree = "<group>"; };
-		344E0E5C0E918B1000483FD6 /* Report.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Report.m; path = Classes/Report.m; sourceTree = "<group>"; };
-		347710940E8BDA9B0051DFFD /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
-		347712720E8D367F0051DFFD /* InputTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputTableViewController.h; sourceTree = "<group>"; };
-		347712730E8D367F0051DFFD /* InputTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputTableViewController.m; sourceTree = "<group>"; wrapsLines = 1; };
-		347A01800E93B6A600D716CB /* EditSubjectView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EditSubjectView.xib; sourceTree = "<group>"; };
-		347A021B0E93CDA200D716CB /* MyCLController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MyCLController.h; path = ../MyCLController.h; sourceTree = "<group>"; };
-		347A021C0E93CDA200D716CB /* MyCLController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MyCLController.m; path = ../MyCLController.m; sourceTree = "<group>"; };
-		347A02760E93D2A800D716CB /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		3481BD1F0EACEE3300C78F66 /* EditingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingTableViewCell.h; sourceTree = "<group>"; };
-		3481BD200EACEE3300C78F66 /* EditingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditingTableViewCell.m; sourceTree = "<group>"; };
-		3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
-		3481BD500EACF81D00C78F66 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; wrapsLines = 1; };
-		348C478F0ECB12DE0030EF1C /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
-		3499E5A30E95311A006F2DA2 /* .cvsignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .cvsignore; sourceTree = "<group>"; };
-		349A01760E928824008E83C1 /* MainViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = "<group>"; };
-		349A561E0ECB07DF0091BE4F /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Classes/Default.png; sourceTree = "<group>"; };
-		349AFEAC0E925AAA008E83C1 /* EditSubjectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditSubjectViewController.h; sourceTree = "<group>"; };
-		349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditSubjectViewController.m; sourceTree = "<group>"; };
-		34C17A530EB0C69700768D1C /* mysociety.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mysociety.png; path = Classes/mysociety.png; sourceTree = "<group>"; };
-		34C17A5B0EB0C77E00768D1C /* AboutView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutView.xib; sourceTree = "<group>"; };
-		34C17A8D0EB0CCD300768D1C /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = "<group>"; };
-		34C17A8E0EB0CCD300768D1C /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; };
-		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
-				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
-				288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
-				347A02770E93D2A800D716CB /* CoreLocation.framework in Frameworks */,
-				3442AA8F0EE578CF000B191D /* SystemConfiguration.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-				34C17A8D0EB0CCD300768D1C /* AboutViewController.h */,
-				34C17A8E0EB0CCD300768D1C /* AboutViewController.m */,
-				347712720E8D367F0051DFFD /* InputTableViewController.h */,
-				347712730E8D367F0051DFFD /* InputTableViewController.m */,
-				3481BD4F0EACF81D00C78F66 /* SettingsViewController.h */,
-				3481BD500EACF81D00C78F66 /* SettingsViewController.m */,
-				347A021B0E93CDA200D716CB /* MyCLController.h */,
-				347A021C0E93CDA200D716CB /* MyCLController.m */,
-				1D3623240D0F684500981E51 /* FixMyStreetAppDelegate.h */,
-				1D3623250D0F684500981E51 /* FixMyStreetAppDelegate.m */,
-				3442AA200EE575BA000B191D /* Reachability.h */,
-				3442AA210EE575BA000B191D /* Reachability.m */,
-				3481BD1F0EACEE3300C78F66 /* EditingTableViewCell.h */,
-				3481BD200EACEE3300C78F66 /* EditingTableViewCell.m */,
-				349AFEAC0E925AAA008E83C1 /* EditSubjectViewController.h */,
-				349AFEAD0E925AAA008E83C1 /* EditSubjectViewController.m */,
-			);
-			path = Classes;
-			sourceTree = "<group>";
-		};
-		19C28FACFE9D520D11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				1D6058910D05DD3D006BFB54 /* FixMyStreet.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-			isa = PBXGroup;
-			children = (
-				3499E5A30E95311A006F2DA2 /* .cvsignore */,
-				342F98810E94E3DE006935E9 /* OldStuff */,
-				080E96DDFE201D6D7F000001 /* Classes */,
-				342F98AD0E951731006935E9 /* Settings */,
-				29B97315FDCFA39411CA2CEA /* Other Sources */,
-				29B97317FDCFA39411CA2CEA /* Resources */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
-				19C28FACFE9D520D11CA2CBB /* Products */,
-			);
-			name = CustomTemplate;
-			sourceTree = "<group>";
-		};
-		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-				32CA4F630368D1EE00C91783 /* FixMyStreet_Prefix.pch */,
-				29B97316FDCFA39411CA2CEA /* main.m */,
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
-		29B97317FDCFA39411CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				348C478F0ECB12DE0030EF1C /* Entitlements.plist */,
-				34C17A5B0EB0C77E00768D1C /* AboutView.xib */,
-				349A561E0ECB07DF0091BE4F /* Default.png */,
-				34C17A530EB0C69700768D1C /* mysociety.png */,
-				347710940E8BDA9B0051DFFD /* Icon.png */,
-				347A01800E93B6A600D716CB /* EditSubjectView.xib */,
-				28AD733E0D9D9553002E5188 /* MainWindow.xib */,
-				349A01760E928824008E83C1 /* MainViewController.xib */,
-				8D1107310486CEB800E47090 /* Info.plist */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				3442AA8E0EE578CF000B191D /* SystemConfiguration.framework */,
-				347A02760E93D2A800D716CB /* CoreLocation.framework */,
-				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
-				1D30AB110D05D00D00671497 /* Foundation.framework */,
-				288765FC0DF74451002DB57D /* CoreGraphics.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		342F98810E94E3DE006935E9 /* OldStuff */ = {
-			isa = PBXGroup;
-			children = (
-				344E0E5C0E918B1000483FD6 /* Report.m */,
-				344E0D550E91440500483FD6 /* imageCell.m */,
-				344E0E5B0E918B1000483FD6 /* Report.h */,
-				344E0D540E91440500483FD6 /* imageCell.h */,
-			);
-			name = OldStuff;
-			sourceTree = "<group>";
-		};
-		342F98AD0E951731006935E9 /* Settings */ = {
-			isa = PBXGroup;
-			children = (
-				342F98AE0E951731006935E9 /* Root.plist */,
-			);
-			name = Settings;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		1D6058900D05DD3D006BFB54 /* FixMyStreet */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "FixMyStreet" */;
-			buildPhases = (
-				1D60588D0D05DD3D006BFB54 /* Resources */,
-				1D60588E0D05DD3D006BFB54 /* Sources */,
-				1D60588F0D05DD3D006BFB54 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = FixMyStreet;
-			productName = FixMyStreet;
-			productReference = 1D6058910D05DD3D006BFB54 /* FixMyStreet.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		29B97313FDCFA39411CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "FixMyStreet" */;
-			compatibilityVersion = "Xcode 3.1";
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-				en,
-			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				1D6058900D05DD3D006BFB54 /* FixMyStreet */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		1D60588D0D05DD3D006BFB54 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */,
-				347710950E8BDA9B0051DFFD /* Icon.png in Resources */,
-				349A01770E928824008E83C1 /* MainViewController.xib in Resources */,
-				347A01810E93B6A600D716CB /* EditSubjectView.xib in Resources */,
-				3499E5A40E95311A006F2DA2 /* .cvsignore in Resources */,
-				34C17A540EB0C69800768D1C /* mysociety.png in Resources */,
-				34C17A5C0EB0C77E00768D1C /* AboutView.xib in Resources */,
-				349A561F0ECB07DF0091BE4F /* Default.png in Resources */,
-				348C47900ECB12DE0030EF1C /* Entitlements.plist in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		1D60588E0D05DD3D006BFB54 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				1D60589B0D05DD56006BFB54 /* main.m in Sources */,
-				1D3623260D0F684500981E51 /* FixMyStreetAppDelegate.m in Sources */,
-				347712740E8D367F0051DFFD /* InputTableViewController.m in Sources */,
-				344E0D560E91440500483FD6 /* imageCell.m in Sources */,
-				344E0E5D0E918B1000483FD6 /* Report.m in Sources */,
-				349AFEAE0E925AAA008E83C1 /* EditSubjectViewController.m in Sources */,
-				347A021D0E93CDA200D716CB /* MyCLController.m in Sources */,
-				3481BD210EACEE3300C78F66 /* EditingTableViewCell.m in Sources */,
-				3481BD510EACF81D00C78F66 /* SettingsViewController.m in Sources */,
-				34C17A8F0EB0CCD300768D1C /* AboutViewController.m in Sources */,
-				3442AA220EE575BA000B191D /* Reachability.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		1D6058940D05DD3E006BFB54 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)\"",
-				);
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = FixMyStreet_Prefix.pch;
-				INFOPLIST_FILE = Info.plist;
-				PRODUCT_NAME = FixMyStreet;
-			};
-			name = Debug;
-		};
-		1D6058950D05DD3E006BFB54 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)\"",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = FixMyStreet_Prefix.pch;
-				INFOPLIST_FILE = Info.plist;
-				PRODUCT_NAME = FixMyStreet;
-			};
-			name = Release;
-		};
-		346099980ED46A5D00B731FF /* Distribution AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = iphoneos2.1;
-			};
-			name = "Distribution AppStore";
-		};
-		346099990ED46A5D00B731FF /* Distribution AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: UK Citizens Online Democracy";
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)\"",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = FixMyStreet_Prefix.pch;
-				INFOPLIST_FILE = Info.plist;
-				PRODUCT_NAME = FixMyStreet;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "74CF3CC5-0ADC-4BF7-A4F1-21B5B4804F9E";
-			};
-			name = "Distribution AppStore";
-		};
-		349A563F0ECB108A0091BE4F /* Distribution */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = iphoneos2.1;
-			};
-			name = Distribution;
-		};
-		349A56400ECB108A0091BE4F /* Distribution */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: UK Citizens Online Democracy";
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)\"",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = FixMyStreet_Prefix.pch;
-				INFOPLIST_FILE = Info.plist;
-				PRODUCT_NAME = FixMyStreet;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "3A3A6AE0-D989-4F0B-A3B2-5C628CBC57DE";
-			};
-			name = Distribution;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = iphoneos2.1;
-			};
-			name = Debug;
-		};
-		C01FCF5008A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = iphoneos2.1;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "FixMyStreet" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1D6058940D05DD3E006BFB54 /* Debug */,
-				1D6058950D05DD3E006BFB54 /* Release */,
-				349A56400ECB108A0091BE4F /* Distribution */,
-				346099990ED46A5D00B731FF /* Distribution AppStore */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "FixMyStreet" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
-				C01FCF5008A954540054247B /* Release */,
-				349A563F0ECB108A0091BE4F /* Distribution */,
-				346099980ED46A5D00B731FF /* Distribution AppStore */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/iphone/FixMyStreet/FixMyStreet_Prefix.pch b/iphone/FixMyStreet/FixMyStreet_Prefix.pch
deleted file mode 100644
index aff82adce..000000000
--- a/iphone/FixMyStreet/FixMyStreet_Prefix.pch
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Prefix header for all source files of the 'FixMyStreet' target in the 'FixMyStreet' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-    #import <UIKit/UIKit.h>
-	#import <CoreLocation/CoreLocation.h>
-#endif
diff --git a/iphone/FixMyStreet/Icon.png b/iphone/FixMyStreet/Icon.png
deleted file mode 100755
index 87e437a18..000000000
--- a/iphone/FixMyStreet/Icon.png
+++ /dev/null
diff --git a/iphone/FixMyStreet/Info.plist b/iphone/FixMyStreet/Info.plist
deleted file mode 100644
index fc58246b7..000000000
--- a/iphone/FixMyStreet/Info.plist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>org.mysociety.${PRODUCT_NAME:identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0.3</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSMainNibFile</key>
-	<string>MainWindow</string>
-</dict>
-</plist>
diff --git a/iphone/FixMyStreet/MainViewController copy.xib b/iphone/FixMyStreet/MainViewController copy.xib
deleted file mode 100644
index 480b7f6c6..000000000
--- a/iphone/FixMyStreet/MainViewController copy.xib
+++ /dev/null
@@ -1,433 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02">
-	<data>
-		<int key="IBDocument.SystemTarget">528</int>
-		<string key="IBDocument.SystemVersion">9F33</string>
-		<string key="IBDocument.InterfaceBuilderVersion">672</string>
-		<string key="IBDocument.AppKitVersion">949.34</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="16"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-			</object>
-			<object class="IBProxyObject" id="711762367">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUITableView" id="22920685">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{0, -3}, {327, 483}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<bool key="IBUIBouncesZoom">NO</bool>
-						<int key="IBUIStyle">1</int>
-						<int key="IBUISeparatorStyle">1</int>
-						<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-						<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-						<float key="IBUIRowHeight">4.400000e+01</float>
-						<float key="IBUISectionHeaderHeight">2.700000e+01</float>
-						<float key="IBUISectionFooterHeight">2.700000e+01</float>
-					</object>
-					<object class="IBUITableView" id="810055614">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{0, 128}, {320, 352}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<bool key="IBUIBouncesZoom">NO</bool>
-						<int key="IBUIStyle">1</int>
-						<int key="IBUISeparatorStyle">1</int>
-						<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-						<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-						<float key="IBUIRowHeight">4.400000e+01</float>
-						<float key="IBUISectionHeaderHeight">2.700000e+01</float>
-						<float key="IBUISectionFooterHeight">2.700000e+01</float>
-					</object>
-					<object class="IBUIView" id="691946431">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<object class="NSMutableArray" key="NSSubviews">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBUILabel" id="380571351">
-								<reference key="NSNextResponder" ref="691946431"/>
-								<int key="NSvFlags">-2147483356</int>
-								<string key="NSFrame">{{0, 79}, {100, 21}}</string>
-								<reference key="NSSuperview" ref="691946431"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MAA</bytes>
-								</object>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClipsSubviews">YES</bool>
-								<float key="IBUIAlpha">5.000000e-01</float>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="IBUIText">Add photo</string>
-								<object class="NSColor" key="IBUITextColor" id="819630230">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MSAxIDEAA</bytes>
-								</object>
-								<nil key="IBUIHighlightedColor"/>
-								<int key="IBUIBaselineAdjustment">1</int>
-								<float key="IBUIMinimumFontSize">1.000000e+01</float>
-								<int key="IBUITextAlignment">1</int>
-							</object>
-							<object class="IBUIButton" id="612997257">
-								<reference key="NSNextResponder" ref="691946431"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrameSize">{100, 100}</string>
-								<reference key="NSSuperview" ref="691946431"/>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<object class="NSFont" key="IBUIFont" id="415071891">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">1.500000e+01</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<int key="IBUIButtonType">1</int>
-								<string key="IBUIHighlightedTitle"/>
-								<string key="IBUIDisabledTitle"/>
-								<string key="IBUISelectedTitle"/>
-								<string key="IBUINormalTitle"/>
-								<reference key="IBUIHighlightedTitleColor" ref="819630230"/>
-								<object class="NSColor" key="IBUINormalTitleColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-								</object>
-							</object>
-							<object class="IBUIImageView" id="614509932">
-								<reference key="NSNextResponder" ref="691946431"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{-70, -14}, {240, 128}}</string>
-								<reference key="NSSuperview" ref="691946431"/>
-								<bool key="IBUIOpaque">NO</bool>
-								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-								<int key="IBUIContentMode">4</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-							</object>
-						</object>
-						<string key="NSFrame">{{200, 20}, {100, 100}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="440851013">
-								<int key="NSID">2</int>
-							</object>
-						</object>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-					</object>
-					<object class="IBUIButton" id="555835234">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{9, 20}, {100, 100}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<reference key="IBUIFont" ref="415071891"/>
-						<int key="IBUIButtonType">1</int>
-						<string key="IBUIHighlightedTitle">Add photo</string>
-						<string key="IBUIDisabledTitle">Add photo</string>
-						<string key="IBUISelectedTitle">Add photo</string>
-						<string key="IBUINormalTitle">Add photo</string>
-						<reference key="IBUIHighlightedTitleColor" ref="819630230"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-						</object>
-						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage" id="806848119">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">Icon.png</string>
-						</object>
-						<reference key="IBUIDisabledBackgroundImage" ref="806848119"/>
-						<reference key="IBUISelectedBackgroundImage" ref="806848119"/>
-						<reference key="IBUINormalBackgroundImage" ref="806848119"/>
-					</object>
-				</object>
-				<string key="NSFrameSize">{320, 480}</string>
-				<reference key="NSSuperview"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<reference key="NSCustomColorSpace" ref="440851013"/>
-				</object>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">7</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="810055614"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">8</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="810055614"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">addPhoto:</string>
-						<reference key="source" ref="555835234"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">10</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">addPhotoButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="555835234"/>
-					</object>
-					<int key="connectionID">12</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">fancyAddButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="691946431"/>
-					</object>
-					<int key="connectionID">17</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">addPhoto:</string>
-						<reference key="source" ref="612997257"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">fancyAddButtonImage</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="614509932"/>
-					</object>
-					<int key="connectionID">19</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">actionsToDoView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="810055614"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="360949347">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="810055614"/>
-							<reference ref="22920685"/>
-							<reference ref="555835234"/>
-							<reference ref="691946431"/>
-						</object>
-						<reference key="parent" ref="360949347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="360949347"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="711762367"/>
-						<reference key="parent" ref="360949347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="555835234"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="810055614"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="22920685"/>
-						<reference key="parent" ref="191373211"/>
-						<string key="objectName">Dummy</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="691946431"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="614509932"/>
-							<reference ref="612997257"/>
-							<reference ref="380571351"/>
-						</object>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="380571351"/>
-						<reference key="parent" ref="691946431"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="614509932"/>
-						<reference key="parent" ref="691946431"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="612997257"/>
-						<reference key="parent" ref="691946431"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.CustomClassName</string>
-					<string>-2.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>13.IBPluginDependency</string>
-					<string>14.IBPluginDependency</string>
-					<string>15.IBPluginDependency</string>
-					<string>16.IBEditorWindowLastContentRect</string>
-					<string>16.IBPluginDependency</string>
-					<string>4.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>6.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>InputTableViewController</string>
-					<string>UIResponder</string>
-					<string>{{317, 258}, {320, 480}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>{{669, 701}, {100, 100}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">20</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">InputTableViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">addPhoto:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>actionsToDoView</string>
-							<string>addPhotoButton</string>
-							<string>fancyAddButton</string>
-							<string>fancyAddButtonImage</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UITableView</string>
-							<string>UIButton</string>
-							<string>UIView</string>
-							<string>UIImageView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Classes/InputTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIButton</string>
-					<string key="superclassName">UIControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">FixMyStreet.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
diff --git a/iphone/FixMyStreet/MainViewController.xib b/iphone/FixMyStreet/MainViewController.xib
deleted file mode 100644
index 42e12470a..000000000
--- a/iphone/FixMyStreet/MainViewController.xib
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
-	<data>
-		<int key="IBDocument.SystemTarget">528</int>
-		<string key="IBDocument.SystemVersion">9L31a</string>
-		<string key="IBDocument.InterfaceBuilderVersion">677</string>
-		<string key="IBDocument.AppKitVersion">949.54</string>
-		<string key="IBDocument.HIToolboxVersion">353.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-			</object>
-			<object class="IBProxyObject" id="711762367">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<object class="NSMutableArray" key="NSSubviews">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUITableView" id="810055614">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrameSize">{320, 416}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<bool key="IBUIScrollEnabled">NO</bool>
-						<bool key="IBUIBouncesZoom">NO</bool>
-						<int key="IBUIStyle">1</int>
-						<int key="IBUISeparatorStyle">1</int>
-						<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-						<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-						<float key="IBUIRowHeight">4.400000e+01</float>
-						<float key="IBUISectionHeaderHeight">2.000000e+01</float>
-					</object>
-					<object class="IBUIImageView" id="91336409">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 276}, {200, 120}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUIContentMode">1</int>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
-					</object>
-					<object class="IBUIButton" id="323841673">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{262, 357}, {18, 19}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">1.500000e+01</double>
-							<int key="NSfFlags">16</int>
-						</object>
-						<int key="IBUIButtonType">3</int>
-						<bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
-						<object class="NSColor" key="IBUIHighlightedTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MSAxIDEAA</bytes>
-						</object>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-						</object>
-						<object class="NSColor" key="IBUINormalTitleShadowColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MAA</bytes>
-						</object>
-					</object>
-				</object>
-				<string key="NSFrameSize">{320, 416}</string>
-				<reference key="NSSuperview"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">7</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="810055614"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">8</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="810055614"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">actionsToDoView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="810055614"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">imageView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="91336409"/>
-					</object>
-					<int key="connectionID">22</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">settingsButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="323841673"/>
-					</object>
-					<int key="connectionID">24</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">gotoAbout:</string>
-						<reference key="source" ref="323841673"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">31</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="360949347">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="810055614"/>
-							<reference ref="91336409"/>
-							<reference ref="323841673"/>
-						</object>
-						<reference key="parent" ref="360949347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="360949347"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="711762367"/>
-						<reference key="parent" ref="360949347"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="323841673"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="91336409"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="810055614"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.CustomClassName</string>
-					<string>-2.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>21.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>InputTableViewController</string>
-					<string>UIResponder</string>
-					<string>{{1036, 576}, {320, 416}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">31</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">InputTableViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addPhoto:</string>
-							<string>gotoAbout:</string>
-							<string>gotoSettings:firstTime:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>actionsToDoView</string>
-							<string>imageView</string>
-							<string>settingsButton</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UITableView</string>
-							<string>UIImageView</string>
-							<string>UIButton</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Classes/InputTableViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">FixMyStreet.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">3.0</string>
-	</data>
-</archive>
diff --git a/iphone/FixMyStreet/MainWindow.xib b/iphone/FixMyStreet/MainWindow.xib
deleted file mode 100644
index 46757cfbf..000000000
--- a/iphone/FixMyStreet/MainWindow.xib
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.02">
-	<data>
-		<int key="IBDocument.SystemTarget">528</int>
-		<string key="IBDocument.SystemVersion">9F33</string>
-		<string key="IBDocument.InterfaceBuilderVersion">672</string>
-		<string key="IBDocument.AppKitVersion">949.34</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="2"/>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="IBProxyObject" id="841351856">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-			</object>
-			<object class="IBProxyObject" id="427554174">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-			</object>
-			<object class="IBUICustomObject" id="664661524"/>
-			<object class="IBUIWindow" id="380026005">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">1316</int>
-				<object class="NSPSMatrix" key="NSFrameMatrix"/>
-				<string key="NSFrameSize">{320, 480}</string>
-				<reference key="NSSuperview"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">1</int>
-					<bytes key="NSRGB">MCAwIDAAA</bytes>
-				</object>
-				<bool key="IBUIOpaque">NO</bool>
-				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="664661524"/>
-					</object>
-					<int key="connectionID">4</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="380026005"/>
-					</object>
-					<int key="connectionID">5</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="957960031">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="380026005"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="parent" ref="957960031"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="841351856"/>
-						<reference key="parent" ref="957960031"/>
-						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3</int>
-						<reference key="object" ref="664661524"/>
-						<reference key="parent" ref="957960031"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="427554174"/>
-						<reference key="parent" ref="957960031"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSMutableArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.CustomClassName</string>
-					<string>-2.CustomClassName</string>
-					<string>2.IBAttributePlaceholdersKey</string>
-					<string>2.IBEditorWindowLastContentRect</string>
-					<string>2.IBPluginDependency</string>
-					<string>3.CustomClassName</string>
-					<string>3.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>UIApplication</string>
-					<string>UIResponder</string>
-					<object class="NSMutableDictionary">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<string>{{1297, 618}, {320, 480}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>FixMyStreetAppDelegate</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">13</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">FixMyStreetAppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>navigationController</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UINavigationController</string>
-							<string>UIWindow</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Classes/FixMyStreetAppDelegate.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">FixMyStreetAppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">FixMyStreet.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-	</data>
-</archive>
diff --git a/iphone/FixMyStreet/MyCLController.h b/iphone/FixMyStreet/MyCLController.h
deleted file mode 100755
index a517dc48d..000000000
--- a/iphone/FixMyStreet/MyCLController.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-
-File: MyCLController.h
-Abstract: Singleton class used to talk to CoreLocation and send results back to
-the app's view controllers.
-
-Version: 1.1
-
-Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc.
-("Apple") in consideration of your agreement to the following terms, and your
-use, installation, modification or redistribution of this Apple software
-constitutes acceptance of these terms.  If you do not agree with these terms,
-please do not use, install, modify or redistribute this Apple software.
-
-In consideration of your agreement to abide by the following terms, and subject
-to these terms, Apple grants you a personal, non-exclusive license, under
-Apple's copyrights in this original Apple software (the "Apple Software"), to
-use, reproduce, modify and redistribute the Apple Software, with or without
-modifications, in source and/or binary forms; provided that if you redistribute
-the Apple Software in its entirety and without modifications, you must retain
-this notice and the following text and disclaimers in all such redistributions
-of the Apple Software.
-Neither the name, trademarks, service marks or logos of Apple Inc. may be used
-to endorse or promote products derived from the Apple Software without specific
-prior written permission from Apple.  Except as expressly stated in this notice,
-no other rights or licenses, express or implied, are granted by Apple herein,
-including but not limited to any patent rights that may be infringed by your
-derivative works or by other works in which the Apple Software may be
-incorporated.
-
-The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
-WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
-WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
-COMBINATION WITH YOUR PRODUCTS.
-
-IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
-DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
-CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (C) 2008 Apple Inc. All Rights Reserved.
-
-*/
-
-
-// This protocol is used to send the text for location updates back to another view controller
-@protocol MyCLControllerDelegate <NSObject>
-@required
--(void)newLocationUpdate:(CLLocation *)location;
--(void)newLocationError:(NSString *)text;
-@end
-
-
-// Class definition
-@interface MyCLController : NSObject <CLLocationManagerDelegate> {
-	CLLocationManager *locationManager;
-	id delegate;
-	BOOL updating;
-}
-
-@property (nonatomic, retain) CLLocationManager *locationManager;
-@property (nonatomic,assign) id <MyCLControllerDelegate> delegate;
-@property BOOL updating;
-
--(void)startUpdatingLocation;
--(void)stopUpdatingLocation;
-
-- (void)locationManager:(CLLocationManager *)manager
-	didUpdateToLocation:(CLLocation *)newLocation
-		   fromLocation:(CLLocation *)oldLocation;
-
-- (void)locationManager:(CLLocationManager *)manager
-	   didFailWithError:(NSError *)error;
-
-+ (MyCLController *)sharedInstance;
-
-@end
-
diff --git a/iphone/FixMyStreet/MyCLController.m b/iphone/FixMyStreet/MyCLController.m
deleted file mode 100755
index b5f303337..000000000
--- a/iphone/FixMyStreet/MyCLController.m
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-
-File: MyCLController.m
-Abstract: Singleton class used to talk to CoreLocation and send results back to
-the app's view controllers.
-
-Version: 1.1
-
-Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc.
-("Apple") in consideration of your agreement to the following terms, and your
-use, installation, modification or redistribution of this Apple software
-constitutes acceptance of these terms.  If you do not agree with these terms,
-please do not use, install, modify or redistribute this Apple software.
-
-In consideration of your agreement to abide by the following terms, and subject
-to these terms, Apple grants you a personal, non-exclusive license, under
-Apple's copyrights in this original Apple software (the "Apple Software"), to
-use, reproduce, modify and redistribute the Apple Software, with or without
-modifications, in source and/or binary forms; provided that if you redistribute
-the Apple Software in its entirety and without modifications, you must retain
-this notice and the following text and disclaimers in all such redistributions
-of the Apple Software.
-Neither the name, trademarks, service marks or logos of Apple Inc. may be used
-to endorse or promote products derived from the Apple Software without specific
-prior written permission from Apple.  Except as expressly stated in this notice,
-no other rights or licenses, express or implied, are granted by Apple herein,
-including but not limited to any patent rights that may be infringed by your
-derivative works or by other works in which the Apple Software may be
-incorporated.
-
-The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
-WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
-WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
-COMBINATION WITH YOUR PRODUCTS.
-
-IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
-DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
-CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
-APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (C) 2008 Apple Inc. All Rights Reserved.
-
-*/
-
-#import "MyCLController.h"
-
-// This is a singleton class, see below
-static MyCLController *sharedCLDelegate = nil;
-
-@implementation MyCLController
-
-@synthesize delegate, locationManager, updating;
-
-- (id) init {
-	self = [super init];
-	if (self != nil) {
-		self.locationManager = [[[CLLocationManager alloc] init] autorelease];
-		self.locationManager.delegate = self; // Tells the location manager to send updates to this object
-	}
-	return self;
-}
-
--(void)startUpdatingLocation {
-	self.updating = YES;
-	[self.locationManager startUpdatingLocation];
-}
-
--(void)stopUpdatingLocation {
-	self.updating = NO;
-	[self.locationManager stopUpdatingLocation];
-}
-
-// Called when the location is updated
-- (void)locationManager:(CLLocationManager *)manager
-	didUpdateToLocation:(CLLocation *)newLocation
-		   fromLocation:(CLLocation *)oldLocation
-{
-
-	// Negative accuracy means an invalid or unavailable measurement
-	if (signbit(newLocation.horizontalAccuracy)) {
-		return;
-	}
-	
-	// If location timestamp was ages ago, it's a cached one; ignore it
-	NSTimeInterval howRecent = [newLocation.timestamp timeIntervalSinceNow];
-	if (abs(howRecent) > 5.0) {
-		return;
-	}
-
-	[self.delegate newLocationUpdate:newLocation];
-}
-
-
-// Called when there is an error getting the location
-- (void)locationManager:(CLLocationManager *)manager
-	   didFailWithError:(NSError *)error
-{
-	NSMutableString *errorString = [[[NSMutableString alloc] init] autorelease];
-
-	if ([error domain] == kCLErrorDomain) {
-
-		// We handle CoreLocation-related errors here
-
-		switch ([error code]) {
-			// This error code is usually returned whenever user taps "Don't Allow" in response to
-			// being told your app wants to access the current location. Once this happens, you cannot
-			// attempt to get the location again until the app has quit and relaunched.
-			//
-			// "Don't Allow" on two successive app launches is the same as saying "never allow". The user
-			// can reset this for all apps by going to Settings > General > Reset > Reset Location Warnings.
-			//
-			case kCLErrorDenied:
-				[self stopUpdatingLocation];
-				[self.delegate newLocationError:@"FixMyStreet needs your location to know where your problem is."];
-				break;
-
-			// This error code is usually returned whenever the device has no data or WiFi connectivity,
-			// or when the location cannot be determined for some other reason.
-			//
-			// CoreLocation will keep trying, so you can keep waiting, or prompt the user.
-			//
-			case kCLErrorLocationUnknown:
-				[errorString appendFormat:@"%@\n", NSLocalizedString(@"LocationUnknown", nil)];
-				break;
-
-			// We shouldn't ever get an unknown error code, but just in case...
-			//
-			default:
-				[errorString appendFormat:@"%@ %d\n", NSLocalizedString(@"GenericLocationError", nil), [error code]];
-				break;
-		}
-	} else {
-		// We handle all non-CoreLocation errors here
-		// (we depend on localizedDescription for localization)
-		[errorString appendFormat:@"Error domain: \"%@\"  Error code: %d\n", [error domain], [error code]];
-		[errorString appendFormat:@"Description: \"%@\"\n", [error localizedDescription]];
-	}
-
-	self.updating = NO;
-	
-	// Send the update to our delegate
-	// [self.delegate newLocationUpdate:errorString];
-}
-
-#pragma mark ---- singleton object methods ----
-
-// See "Creating a Singleton Instance" in the Cocoa Fundamentals Guide for more info
-
-+ (MyCLController *)sharedInstance {
-    @synchronized(self) {
-        if (sharedCLDelegate == nil) {
-            [[self alloc] init]; // assignment not done here
-        }
-    }
-    return sharedCLDelegate;
-}
-
-+ (id)allocWithZone:(NSZone *)zone {
-    @synchronized(self) {
-        if (sharedCLDelegate == nil) {
-            sharedCLDelegate = [super allocWithZone:zone];
-            return sharedCLDelegate;  // assignment and return on first allocation
-        }
-    }
-    return nil; // on subsequent allocation attempts return nil
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
-    return self;
-}
-
-- (id)retain {
-    return self;
-}
-
-- (unsigned)retainCount {
-    return UINT_MAX;  // denotes an object that cannot be released
-}
-
-- (void)release {
-    //do nothing
-}
-
-- (id)autorelease {
-    return self;
-}
-
-@end
\ No newline at end of file
diff --git a/iphone/FixMyStreet/Root.plist b/iphone/FixMyStreet/Root.plist
deleted file mode 100755
index a20f07f9f..000000000
--- a/iphone/FixMyStreet/Root.plist
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreferenceSpecifiers</key>
-	<array>
-		<dict>
-			<key>DefaultValue</key>
-			<string></string>
-			<key>Key</key>
-			<string>emailKey</string>
-			<key>Title</key>
-			<string>Email</string>
-			<key>Type</key>
-			<string>PSTextFieldSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<string></string>
-			<key>Key</key>
-			<string>nameKey</string>
-			<key>Title</key>
-			<string>Name</string>
-			<key>Type</key>
-			<string>PSTextFieldSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<string></string>
-			<key>Key</key>
-			<string>phoneKey</string>
-			<key>Title</key>
-			<string>Phone</string>
-			<key>Type</key>
-			<string>PSTextFieldSpecifier</string>
-		</dict>
-	</array>
-	<key>Title</key>
-	<string>FixMyStreet</string>
-</dict>
-</plist>
diff --git a/iphone/FixMyStreet/main.m b/iphone/FixMyStreet/main.m
deleted file mode 100644
index 05f436018..000000000
--- a/iphone/FixMyStreet/main.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  FixMyStreet
-//
-//  Created by Matthew on 25/09/2008.
-//  Copyright UK Citizens Online Democracy 2008. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, nil);
-    [pool release];
-    return retVal;
-}
diff --git a/iphone/FixMyStreet/mysociety.png b/iphone/FixMyStreet/mysociety.png
deleted file mode 100644
index 8a9280c16..000000000
--- a/iphone/FixMyStreet/mysociety.png
+++ /dev/null
diff --git a/iphone/README b/iphone/README
deleted file mode 100644
index 1fbe00e79..000000000
--- a/iphone/README
+++ /dev/null
@@ -1,19 +0,0 @@
-FixMyStreet iPhone application
-==============================
-
-The FixMyStreet directory contains a complete application that should open
-directly in XCode.
-
-TODO (if you're an iPhone or Perl developer and wish to help mySociety,
-----      feel free to volunteer for any of these)
-
-* When you go to the About page from the front page, the navigation bar flips
-  as well as the page. For perfection, it probably shouldn't, but every time I
-  tried (presumably with a parent controller controlling the main view and the
-  about view), I failed, and it's not really /that/ important. :-)
-
-* Do the photos have EXIF data (e.g. location)? Should we use that if so in some way?
-
-* Photo orientation - either auto-working it out from EXIF data/ anything else
-  provided, or letting the user rotate the submitted photo.
-