Buildfixes

I've tried to update the project so that it builds with the latest version of Xcode (4.5.2). I still have one issue that I'm not sure how to resolve related to MainWindow.xib. Getting the following error:

CompileXIB Zapp/en.lproj/MainMenu.xib
    cd /Users/cwhite/Documents/Square/zapp
    setenv XCODE_DEVELOPER_USR_PATH /Applications/Xcode.app/Contents/Developer/usr/bin/..
    /Applications/Xcode.app/Contents/Developer/usr/bin/ibtool --errors --warnings --notices --output-format human-readable-text --compile /Users/cwhite/Library/Developer/Xcode/DerivedData/Zapp-ezrlixvrxabstbecudtlrsgapaxs/Build/Intermediates/ArchiveIntermediates/Zapp/InstallationBuildProductsLocation/Applications/Zapp.app/Contents/Resources/en.lproj/MainMenu.nib /Users/cwhite/Documents/Square/zapp/Zapp/en.lproj/MainMenu.xib --sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk

2012-11-13 11:13:46.096 ibtoold[14091:707] Two members of the document have the object ID 896. This may have happened through an external edit, such as an SCM merge operation.2012-11-13 11:13:46.098 ibtoold[14091:707] Backtrace:  0  0x000000010aff2ba2 -[IBObjectContainer(IBObjectContainerAdditions) verify] (in IDEInterfaceBuilderKi  1  0x000000010afe7afd -[IBObjectContainer initWithCoder:] (in IDEInterfaceBuilderKi  2  0x000000010af9d452 -[IBXMLDecoder deserializeObject:fromElement:] (in IDEInterfaceBuilderKi  3  0x000000010af9df9c __36-[IBXMLDecoder objectForXMLElement:]_block_invoke_0 (in IDEInterfaceBuilderKi  4  0x000000010af9db3b -[IBXMLDecoder invokeRestoringDecodingStack:] (in IDEInterfaceBuilderKi  5  0x000000010af9dd0c -[IBXMLDecoder objectForXMLElement:] (in IDEInterfaceBuilderKi  6  0x000000010af6bed0 -[IBDocument decodeDocumentOfType:withCoder:] (in IDEInterfaceBuilderKi  7  0x000000010d4874b1 -[IBCocoaDocument decodeDocumentOfType:withCoder:] (in IDEInterfaceBuilderCocoaIntegratio  8  0x000000010af6c561 -[IBDocument readFromFileWrapper:ofType:error:] (in IDEInterfaceBuilderKi  9  0x000000010d488a43 -[IBCocoaDocument readFromFileWrapper:ofType:error:] (in IDEInterfaceBuilderCocoaIntegratio 10  0x00007fff8ccd1587 -[NSDocument readFromURL:ofType:error:] (in AppKit 11  0x000000010af67340 __39-[IBDocument readFromURL:ofType:error:]_block_invoke_0 (in IDEInterfaceBuilderKit 12  0x000000010af89653 -[IBDocument invokeWithUndoSuppressed:] (in IDEInterfaceBuilderKit 13  0x000000010af6715e -[IBDocument readFromURL:ofType:error:] (in IDEInterfaceBuilderKit 14  0x000000010ae7e541 (in ibtoold 15  0x000000010ae7b5f9 (in ibtoold 16  0x000000010ae7a0e8 (in ibtoold 17  0x000000010ae79c5f (in ibtoold 18  0x000000010ae79b53 (in ibtoold 19  0x000000010ae86165 (in ibtoold 20  0x000000010ae79684 (in ibtoold 21  0x000000010ae7a8f1 (in ibtoold 22  0x000000010ae78524 (in ibtoold2012-11-13 11:13:46.098 ibtoold[14091:707] Exception raised while decoding document objects - Two members of the document have the object ID 896. This may have happened through an external edit, such as an SCM merge operation./* com.apple.ibtool.errors */    Failure Reason: Two members of the document have the object ID 896. This may have happened through an external edit, such as an SCM merge operat    Recovery Suggestion: Check the console log for additional informat