Made project compile again

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "KeePassLib"]
-	path = KeePassLib
-	url = https://mstarke@github.com/mstarke/KeePassLib.git
 [submodule "KissXML"]
 	path = KissXML
 	url = https://github.com/robbiehanson/KissXML.git
+[submodule "MiniKeePassLib"]
+	path = MiniKeePassLib
+	url = https://mstarke@github.com/mstarke/MiniKeePassLib.git

MacPass.xcodeproj/project.pbxproj

@@ -8,69 +8,141 @@
 
 /* Begin PBXBuildFile section */
 		4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; };
+		4C669B7F16760ED100DD0774 /* AesInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3116760ED100DD0774 /* AesInputStream.m */; };
+		4C669B8016760ED100DD0774 /* AesOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3316760ED100DD0774 /* AesOutputStream.m */; };
+		4C669B8116760ED100DD0774 /* Arc4RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3516760ED100DD0774 /* Arc4RandomStream.m */; };
+		4C669B8216760ED100DD0774 /* DataInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3716760ED100DD0774 /* DataInputStream.m */; };
+		4C669B8316760ED100DD0774 /* DataOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3916760ED100DD0774 /* DataOutputStream.m */; };
+		4C669B8416760ED100DD0774 /* FileInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3B16760ED100DD0774 /* FileInputStream.m */; };
+		4C669B8516760ED100DD0774 /* FileOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3D16760ED100DD0774 /* FileOutputStream.m */; };
+		4C669B8616760ED100DD0774 /* GZipInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3F16760ED100DD0774 /* GZipInputStream.m */; };
+		4C669B8716760ED100DD0774 /* GZipOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4116760ED100DD0774 /* GZipOutputStream.m */; };
+		4C669B8816760ED100DD0774 /* HashedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4316760ED100DD0774 /* HashedInputStream.m */; };
+		4C669B8916760ED100DD0774 /* HashedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4516760ED100DD0774 /* HashedOutputStream.m */; };
+		4C669B8A16760ED100DD0774 /* InputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4716760ED100DD0774 /* InputStream.m */; };
+		4C669B8B16760ED100DD0774 /* OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4916760ED100DD0774 /* OutputStream.m */; };
+		4C669B8C16760ED100DD0774 /* Sha256OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */; };
+		4C669B8E16760ED100DD0774 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5016760ED100DD0774 /* Base64.m */; };
+		4C669B8F16760ED100DD0774 /* DDXMLDocument+MKPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */; };
+		4C669B9016760ED100DD0774 /* DDXMLElement+MKPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5416760ED100DD0774 /* DDXMLElement+MKPAdditions.m */; };
+		4C669B9116760ED100DD0774 /* Kdb.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5616760ED100DD0774 /* Kdb.m */; };
+		4C669B9216760ED100DD0774 /* Kdb3Date.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5816760ED100DD0774 /* Kdb3Date.m */; };
+		4C669B9316760ED100DD0774 /* Kdb3Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5A16760ED100DD0774 /* Kdb3Node.m */; };
+		4C669B9416760ED100DD0774 /* Kdb3Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5C16760ED100DD0774 /* Kdb3Reader.m */; };
+		4C669B9516760ED100DD0774 /* Kdb3Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B5E16760ED100DD0774 /* Kdb3Utils.m */; };
+		4C669B9616760ED100DD0774 /* Kdb3Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6016760ED100DD0774 /* Kdb3Writer.m */; };
+		4C669B9716760ED100DD0774 /* Kdb4Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6216760ED100DD0774 /* Kdb4Node.m */; };
+		4C669B9816760ED100DD0774 /* Kdb4Parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6416760ED100DD0774 /* Kdb4Parser.m */; };
+		4C669B9916760ED100DD0774 /* Kdb4Persist.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6616760ED100DD0774 /* Kdb4Persist.m */; };
+		4C669B9A16760ED100DD0774 /* Kdb4Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6816760ED100DD0774 /* Kdb4Reader.m */; };
+		4C669B9B16760ED100DD0774 /* Kdb4Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6A16760ED100DD0774 /* Kdb4Writer.m */; };
+		4C669B9C16760ED100DD0774 /* KdbPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B6D16760ED100DD0774 /* KdbPassword.m */; };
+		4C669B9D16760ED100DD0774 /* KdbReaderFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7016760ED100DD0774 /* KdbReaderFactory.m */; };
+		4C669B9E16760ED100DD0774 /* KdbWriterFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7316760ED100DD0774 /* KdbWriterFactory.m */; };
+		4C669B9F16760ED100DD0774 /* RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7516760ED100DD0774 /* RandomStream.m */; };
+		4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */; };
+		4C669BA116760ED100DD0774 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7916760ED100DD0774 /* Utils.m */; };
+		4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; };
 		4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; };
 		4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E36F15B84A240093A587 /* InfoPlist.strings */; };
 		4C77E37315B84A240093A587 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37215B84A240093A587 /* main.m */; };
 		4C77E37715B84A240093A587 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37515B84A240093A587 /* Credits.rtf */; };
 		4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37915B84A240093A587 /* MPAppDelegate.m */; };
 		4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37B15B84A240093A587 /* MainMenu.xib */; };
+		4C83814215BF4677001AE468 /* MPMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPMainWindowController.m */; };
 		4C88763415BABA30003D2CE9 /* PasswordWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C88763315BABA30003D2CE9 /* PasswordWindow.xib */; };
 		4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; };
 		4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */; };
 		4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; };
 		4CA0B2FC15BCAF8600654E32 /* MPSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsController.m */; };
-		4CAD742E15B8860800104512 /* AesInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73E615B8860800104512 /* AesInputStream.m */; };
-		4CAD742F15B8860800104512 /* AesOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73E815B8860800104512 /* AesOutputStream.m */; };
-		4CAD743015B8860800104512 /* Arc4RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73EA15B8860800104512 /* Arc4RandomStream.m */; };
-		4CAD743115B8860800104512 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73EC15B8860800104512 /* Base64.m */; };
-		4CAD743215B8860800104512 /* DataInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73EE15B8860800104512 /* DataInputStream.m */; };
-		4CAD743315B8860800104512 /* DataOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F015B8860800104512 /* DataOutputStream.m */; };
-		4CAD743415B8860800104512 /* FileInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F215B8860800104512 /* FileInputStream.m */; };
-		4CAD743515B8860800104512 /* FileOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F415B8860800104512 /* FileOutputStream.m */; };
-		4CAD743615B8860800104512 /* GZipInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F615B8860800104512 /* GZipInputStream.m */; };
-		4CAD743715B8860800104512 /* GZipOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73F815B8860800104512 /* GZipOutputStream.m */; };
-		4CAD743815B8860800104512 /* HashedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73FA15B8860800104512 /* HashedInputStream.m */; };
-		4CAD743915B8860800104512 /* HashedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73FC15B8860800104512 /* HashedOutputStream.m */; };
-		4CAD743A15B8860800104512 /* InputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD73FE15B8860800104512 /* InputStream.m */; };
-		4CAD743B15B8860800104512 /* Kdb.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740015B8860800104512 /* Kdb.m */; };
-		4CAD743C15B8860800104512 /* Kdb3Date.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740215B8860800104512 /* Kdb3Date.m */; };
-		4CAD743D15B8860800104512 /* Kdb3Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740415B8860800104512 /* Kdb3Node.m */; };
-		4CAD743E15B8860800104512 /* Kdb3Parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740615B8860800104512 /* Kdb3Parser.m */; };
-		4CAD743F15B8860800104512 /* Kdb3Persist.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740815B8860800104512 /* Kdb3Persist.m */; };
-		4CAD744015B8860800104512 /* Kdb3Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740A15B8860800104512 /* Kdb3Reader.m */; };
-		4CAD744115B8860800104512 /* Kdb3Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740C15B8860800104512 /* Kdb3Writer.m */; };
-		4CAD744215B8860800104512 /* Kdb4Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD740E15B8860800104512 /* Kdb4Node.m */; };
-		4CAD744315B8860800104512 /* Kdb4Parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741015B8860800104512 /* Kdb4Parser.m */; };
-		4CAD744415B8860800104512 /* Kdb4Persist.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741215B8860800104512 /* Kdb4Persist.m */; };
-		4CAD744515B8860800104512 /* Kdb4Reader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741415B8860800104512 /* Kdb4Reader.m */; };
-		4CAD744615B8860800104512 /* Kdb4Writer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741615B8860800104512 /* Kdb4Writer.m */; };
-		4CAD744715B8860800104512 /* KdbPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741915B8860800104512 /* KdbPassword.m */; };
-		4CAD744815B8860800104512 /* KdbReaderFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741C15B8860800104512 /* KdbReaderFactory.m */; };
-		4CAD744915B8860800104512 /* KdbWriterFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD741F15B8860800104512 /* KdbWriterFactory.m */; };
-		4CAD744A15B8860800104512 /* OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742115B8860800104512 /* OutputStream.m */; };
-		4CAD744B15B8860800104512 /* RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742315B8860800104512 /* RandomStream.m */; };
-		4CAD744D15B8860800104512 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742615B8860800104512 /* Salsa20RandomStream.m */; };
-		4CAD744E15B8860800104512 /* Sha256OutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742815B8860800104512 /* Sha256OutputStream.m */; };
-		4CAD744F15B8860800104512 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742A15B8860800104512 /* Utils.m */; };
-		4CAD745015B8860800104512 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD742C15B8860800104512 /* UUID.m */; };
-		4CAD747915B887FD00104512 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD745215B887FD00104512 /* .gitignore */; };
-		4CAD747A15B887FD00104512 /* .hgignore in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD745315B887FD00104512 /* .hgignore */; };
 		4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		4CAD747E15B887FD00104512 /* DDXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745F15B887FD00104512 /* DDXMLElement.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		4CAD747F15B887FD00104512 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD746115B887FD00104512 /* DDXMLNode.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		4CAD748015B887FD00104512 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD746415B887FD00104512 /* LICENSE.txt */; };
-		4CAD748115B887FD00104512 /* README.markdown in Resources */ = {isa = PBXBuildFile; fileRef = 4CAD746515B887FD00104512 /* README.markdown */; };
 		4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; };
 		4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; };
 		4CBA981815BA0DB600721965 /* MPDatabaseDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA981715BA0DB600721965 /* MPDatabaseDocument.m */; };
 		4CC6259115BA1C99002F5B11 /* MPOutlineViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */; };
+		4CD884B715BD47080042BBF8 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD884B615BD47080042BBF8 /* MainWindow.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		4C37A83E15B8B474005EF8EE /* MPOutlineDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineDataSource.h; sourceTree = "<group>"; };
 		4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineDataSource.m; sourceTree = "<group>"; };
+		4C669B3016760ED100DD0774 /* AesInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesInputStream.h; sourceTree = "<group>"; };
+		4C669B3116760ED100DD0774 /* AesInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesInputStream.m; sourceTree = "<group>"; };
+		4C669B3216760ED100DD0774 /* AesOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesOutputStream.h; sourceTree = "<group>"; };
+		4C669B3316760ED100DD0774 /* AesOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesOutputStream.m; sourceTree = "<group>"; };
+		4C669B3416760ED100DD0774 /* Arc4RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arc4RandomStream.h; sourceTree = "<group>"; };
+		4C669B3516760ED100DD0774 /* Arc4RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Arc4RandomStream.m; sourceTree = "<group>"; };
+		4C669B3616760ED100DD0774 /* DataInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataInputStream.h; sourceTree = "<group>"; };
+		4C669B3716760ED100DD0774 /* DataInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataInputStream.m; sourceTree = "<group>"; };
+		4C669B3816760ED100DD0774 /* DataOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataOutputStream.h; sourceTree = "<group>"; };
+		4C669B3916760ED100DD0774 /* DataOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataOutputStream.m; sourceTree = "<group>"; };
+		4C669B3A16760ED100DD0774 /* FileInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInputStream.h; sourceTree = "<group>"; };
+		4C669B3B16760ED100DD0774 /* FileInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileInputStream.m; sourceTree = "<group>"; };
+		4C669B3C16760ED100DD0774 /* FileOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileOutputStream.h; sourceTree = "<group>"; };
+		4C669B3D16760ED100DD0774 /* FileOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileOutputStream.m; sourceTree = "<group>"; };
+		4C669B3E16760ED100DD0774 /* GZipInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipInputStream.h; sourceTree = "<group>"; };
+		4C669B3F16760ED100DD0774 /* GZipInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipInputStream.m; sourceTree = "<group>"; };
+		4C669B4016760ED100DD0774 /* GZipOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipOutputStream.h; sourceTree = "<group>"; };
+		4C669B4116760ED100DD0774 /* GZipOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipOutputStream.m; sourceTree = "<group>"; };
+		4C669B4216760ED100DD0774 /* HashedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedInputStream.h; sourceTree = "<group>"; };
+		4C669B4316760ED100DD0774 /* HashedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedInputStream.m; sourceTree = "<group>"; };
+		4C669B4416760ED100DD0774 /* HashedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedOutputStream.h; sourceTree = "<group>"; };
+		4C669B4516760ED100DD0774 /* HashedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedOutputStream.m; sourceTree = "<group>"; };
+		4C669B4616760ED100DD0774 /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStream.h; sourceTree = "<group>"; };
+		4C669B4716760ED100DD0774 /* InputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputStream.m; sourceTree = "<group>"; };
+		4C669B4816760ED100DD0774 /* OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputStream.h; sourceTree = "<group>"; };
+		4C669B4916760ED100DD0774 /* OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OutputStream.m; sourceTree = "<group>"; };
+		4C669B4A16760ED100DD0774 /* Sha256OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sha256OutputStream.h; sourceTree = "<group>"; };
+		4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sha256OutputStream.m; sourceTree = "<group>"; };
+		4C669B4F16760ED100DD0774 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
+		4C669B5016760ED100DD0774 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; };
+		4C669B5116760ED100DD0774 /* DDXMLDocument+MKPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDXMLDocument+MKPAdditions.h"; sourceTree = "<group>"; };
+		4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DDXMLDocument+MKPAdditions.m"; sourceTree = "<group>"; };
+		4C669B5316760ED100DD0774 /* DDXMLElement+MKPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDXMLElement+MKPAdditions.h"; sourceTree = "<group>"; };
+		4C669B5416760ED100DD0774 /* DDXMLElement+MKPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DDXMLElement+MKPAdditions.m"; sourceTree = "<group>"; };
+		4C669B5516760ED100DD0774 /* Kdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb.h; sourceTree = "<group>"; };
+		4C669B5616760ED100DD0774 /* Kdb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb.m; sourceTree = "<group>"; };
+		4C669B5716760ED100DD0774 /* Kdb3Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Date.h; sourceTree = "<group>"; };
+		4C669B5816760ED100DD0774 /* Kdb3Date.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Date.m; sourceTree = "<group>"; };
+		4C669B5916760ED100DD0774 /* Kdb3Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Node.h; sourceTree = "<group>"; };
+		4C669B5A16760ED100DD0774 /* Kdb3Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Node.m; sourceTree = "<group>"; };
+		4C669B5B16760ED100DD0774 /* Kdb3Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Reader.h; sourceTree = "<group>"; };
+		4C669B5C16760ED100DD0774 /* Kdb3Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Reader.m; sourceTree = "<group>"; };
+		4C669B5D16760ED100DD0774 /* Kdb3Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Utils.h; sourceTree = "<group>"; };
+		4C669B5E16760ED100DD0774 /* Kdb3Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Utils.m; sourceTree = "<group>"; };
+		4C669B5F16760ED100DD0774 /* Kdb3Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Writer.h; sourceTree = "<group>"; };
+		4C669B6016760ED100DD0774 /* Kdb3Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Writer.m; sourceTree = "<group>"; };
+		4C669B6116760ED100DD0774 /* Kdb4Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Node.h; sourceTree = "<group>"; };
+		4C669B6216760ED100DD0774 /* Kdb4Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Node.m; sourceTree = "<group>"; };
+		4C669B6316760ED100DD0774 /* Kdb4Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Parser.h; sourceTree = "<group>"; };
+		4C669B6416760ED100DD0774 /* Kdb4Parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Parser.m; sourceTree = "<group>"; };
+		4C669B6516760ED100DD0774 /* Kdb4Persist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Persist.h; sourceTree = "<group>"; };
+		4C669B6616760ED100DD0774 /* Kdb4Persist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Persist.m; sourceTree = "<group>"; };
+		4C669B6716760ED100DD0774 /* Kdb4Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Reader.h; sourceTree = "<group>"; };
+		4C669B6816760ED100DD0774 /* Kdb4Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Reader.m; sourceTree = "<group>"; };
+		4C669B6916760ED100DD0774 /* Kdb4Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Writer.h; sourceTree = "<group>"; };
+		4C669B6A16760ED100DD0774 /* Kdb4Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Writer.m; sourceTree = "<group>"; };
+		4C669B6B16760ED100DD0774 /* KdbLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbLib.h; sourceTree = "<group>"; };
+		4C669B6C16760ED100DD0774 /* KdbPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbPassword.h; sourceTree = "<group>"; };
+		4C669B6D16760ED100DD0774 /* KdbPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbPassword.m; sourceTree = "<group>"; };
+		4C669B6E16760ED100DD0774 /* KdbReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReader.h; sourceTree = "<group>"; };
+		4C669B6F16760ED100DD0774 /* KdbReaderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReaderFactory.h; sourceTree = "<group>"; };
+		4C669B7016760ED100DD0774 /* KdbReaderFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbReaderFactory.m; sourceTree = "<group>"; };
+		4C669B7116760ED100DD0774 /* KdbWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriter.h; sourceTree = "<group>"; };
+		4C669B7216760ED100DD0774 /* KdbWriterFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriterFactory.h; sourceTree = "<group>"; };
+		4C669B7316760ED100DD0774 /* KdbWriterFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbWriterFactory.m; sourceTree = "<group>"; };
+		4C669B7416760ED100DD0774 /* RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomStream.h; sourceTree = "<group>"; };
+		4C669B7516760ED100DD0774 /* RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RandomStream.m; sourceTree = "<group>"; };
+		4C669B7616760ED100DD0774 /* Salsa20RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Salsa20RandomStream.h; sourceTree = "<group>"; };
+		4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Salsa20RandomStream.m; sourceTree = "<group>"; };
+		4C669B7816760ED100DD0774 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
+		4C669B7916760ED100DD0774 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
+		4C669B7A16760ED100DD0774 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = "<group>"; };
+		4C669B7B16760ED100DD0774 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = "<group>"; };
 		4C77E36215B84A240093A587 /* MacPass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacPass.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4C77E36615B84A240093A587 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		4C77E36915B84A240093A587 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -84,6 +156,8 @@
 		4C77E37815B84A240093A587 /* MPAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate.h; sourceTree = "<group>"; };
 		4C77E37915B84A240093A587 /* MPAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate.m; sourceTree = "<group>"; };
 		4C77E37C15B84A240093A587 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		4C83814015BF4677001AE468 /* MPMainWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMainWindowController.h; sourceTree = "<group>"; };
+		4C83814115BF4677001AE468 /* MPMainWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMainWindowController.m; sourceTree = "<group>"; };
 		4C88763315BABA30003D2CE9 /* PasswordWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordWindow.xib; sourceTree = "<group>"; };
 		4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindow.xib; sourceTree = "<group>"; };
 		4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralSettings.xib; sourceTree = "<group>"; };
@@ -92,79 +166,6 @@
 		4CA0B2FA15BCAF8600654E32 /* MPSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSettingsController.h; sourceTree = "<group>"; };
 		4CA0B2FB15BCAF8600654E32 /* MPSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSettingsController.m; sourceTree = "<group>"; };
 		4CA0B30D15BCB6FD00654E32 /* MPSettingsTabProtocoll.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPSettingsTabProtocoll.h; sourceTree = "<group>"; };
-		4CAD73E515B8860800104512 /* AesInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesInputStream.h; sourceTree = "<group>"; };
-		4CAD73E615B8860800104512 /* AesInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesInputStream.m; sourceTree = "<group>"; };
-		4CAD73E715B8860800104512 /* AesOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesOutputStream.h; sourceTree = "<group>"; };
-		4CAD73E815B8860800104512 /* AesOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesOutputStream.m; sourceTree = "<group>"; };
-		4CAD73E915B8860800104512 /* Arc4RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arc4RandomStream.h; sourceTree = "<group>"; };
-		4CAD73EA15B8860800104512 /* Arc4RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Arc4RandomStream.m; sourceTree = "<group>"; };
-		4CAD73EB15B8860800104512 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
-		4CAD73EC15B8860800104512 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; };
-		4CAD73ED15B8860800104512 /* DataInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataInputStream.h; sourceTree = "<group>"; };
-		4CAD73EE15B8860800104512 /* DataInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataInputStream.m; sourceTree = "<group>"; };
-		4CAD73EF15B8860800104512 /* DataOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataOutputStream.h; sourceTree = "<group>"; };
-		4CAD73F015B8860800104512 /* DataOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataOutputStream.m; sourceTree = "<group>"; };
-		4CAD73F115B8860800104512 /* FileInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileInputStream.h; sourceTree = "<group>"; };
-		4CAD73F215B8860800104512 /* FileInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileInputStream.m; sourceTree = "<group>"; };
-		4CAD73F315B8860800104512 /* FileOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileOutputStream.h; sourceTree = "<group>"; };
-		4CAD73F415B8860800104512 /* FileOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileOutputStream.m; sourceTree = "<group>"; };
-		4CAD73F515B8860800104512 /* GZipInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipInputStream.h; sourceTree = "<group>"; };
-		4CAD73F615B8860800104512 /* GZipInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipInputStream.m; sourceTree = "<group>"; };
-		4CAD73F715B8860800104512 /* GZipOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GZipOutputStream.h; sourceTree = "<group>"; };
-		4CAD73F815B8860800104512 /* GZipOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GZipOutputStream.m; sourceTree = "<group>"; };
-		4CAD73F915B8860800104512 /* HashedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedInputStream.h; sourceTree = "<group>"; };
-		4CAD73FA15B8860800104512 /* HashedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedInputStream.m; sourceTree = "<group>"; };
-		4CAD73FB15B8860800104512 /* HashedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashedOutputStream.h; sourceTree = "<group>"; };
-		4CAD73FC15B8860800104512 /* HashedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashedOutputStream.m; sourceTree = "<group>"; };
-		4CAD73FD15B8860800104512 /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStream.h; sourceTree = "<group>"; };
-		4CAD73FE15B8860800104512 /* InputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputStream.m; sourceTree = "<group>"; };
-		4CAD73FF15B8860800104512 /* Kdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb.h; sourceTree = "<group>"; };
-		4CAD740015B8860800104512 /* Kdb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb.m; sourceTree = "<group>"; };
-		4CAD740115B8860800104512 /* Kdb3Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Date.h; sourceTree = "<group>"; };
-		4CAD740215B8860800104512 /* Kdb3Date.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Date.m; sourceTree = "<group>"; };
-		4CAD740315B8860800104512 /* Kdb3Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Node.h; sourceTree = "<group>"; };
-		4CAD740415B8860800104512 /* Kdb3Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Node.m; sourceTree = "<group>"; };
-		4CAD740515B8860800104512 /* Kdb3Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Parser.h; sourceTree = "<group>"; };
-		4CAD740615B8860800104512 /* Kdb3Parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Parser.m; sourceTree = "<group>"; };
-		4CAD740715B8860800104512 /* Kdb3Persist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Persist.h; sourceTree = "<group>"; };
-		4CAD740815B8860800104512 /* Kdb3Persist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Persist.m; sourceTree = "<group>"; };
-		4CAD740915B8860800104512 /* Kdb3Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Reader.h; sourceTree = "<group>"; };
-		4CAD740A15B8860800104512 /* Kdb3Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Reader.m; sourceTree = "<group>"; };
-		4CAD740B15B8860800104512 /* Kdb3Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb3Writer.h; sourceTree = "<group>"; };
-		4CAD740C15B8860800104512 /* Kdb3Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb3Writer.m; sourceTree = "<group>"; };
-		4CAD740D15B8860800104512 /* Kdb4Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Node.h; sourceTree = "<group>"; };
-		4CAD740E15B8860800104512 /* Kdb4Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Node.m; sourceTree = "<group>"; };
-		4CAD740F15B8860800104512 /* Kdb4Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Parser.h; sourceTree = "<group>"; };
-		4CAD741015B8860800104512 /* Kdb4Parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Parser.m; sourceTree = "<group>"; };
-		4CAD741115B8860800104512 /* Kdb4Persist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Persist.h; sourceTree = "<group>"; };
-		4CAD741215B8860800104512 /* Kdb4Persist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Persist.m; sourceTree = "<group>"; };
-		4CAD741315B8860800104512 /* Kdb4Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Reader.h; sourceTree = "<group>"; };
-		4CAD741415B8860800104512 /* Kdb4Reader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Reader.m; sourceTree = "<group>"; };
-		4CAD741515B8860800104512 /* Kdb4Writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Kdb4Writer.h; sourceTree = "<group>"; };
-		4CAD741615B8860800104512 /* Kdb4Writer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Kdb4Writer.m; sourceTree = "<group>"; };
-		4CAD741715B8860800104512 /* KdbLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbLib.h; sourceTree = "<group>"; };
-		4CAD741815B8860800104512 /* KdbPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbPassword.h; sourceTree = "<group>"; };
-		4CAD741915B8860800104512 /* KdbPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbPassword.m; sourceTree = "<group>"; };
-		4CAD741A15B8860800104512 /* KdbReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReader.h; sourceTree = "<group>"; };
-		4CAD741B15B8860800104512 /* KdbReaderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbReaderFactory.h; sourceTree = "<group>"; };
-		4CAD741C15B8860800104512 /* KdbReaderFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbReaderFactory.m; sourceTree = "<group>"; };
-		4CAD741D15B8860800104512 /* KdbWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriter.h; sourceTree = "<group>"; };
-		4CAD741E15B8860800104512 /* KdbWriterFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KdbWriterFactory.h; sourceTree = "<group>"; };
-		4CAD741F15B8860800104512 /* KdbWriterFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KdbWriterFactory.m; sourceTree = "<group>"; };
-		4CAD742015B8860800104512 /* OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputStream.h; sourceTree = "<group>"; };
-		4CAD742115B8860800104512 /* OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OutputStream.m; sourceTree = "<group>"; };
-		4CAD742215B8860800104512 /* RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RandomStream.h; sourceTree = "<group>"; };
-		4CAD742315B8860800104512 /* RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RandomStream.m; sourceTree = "<group>"; };
-		4CAD742515B8860800104512 /* Salsa20RandomStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Salsa20RandomStream.h; sourceTree = "<group>"; };
-		4CAD742615B8860800104512 /* Salsa20RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Salsa20RandomStream.m; sourceTree = "<group>"; };
-		4CAD742715B8860800104512 /* Sha256OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sha256OutputStream.h; sourceTree = "<group>"; };
-		4CAD742815B8860800104512 /* Sha256OutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sha256OutputStream.m; sourceTree = "<group>"; };
-		4CAD742915B8860800104512 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
-		4CAD742A15B8860800104512 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
-		4CAD742B15B8860800104512 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = "<group>"; };
-		4CAD742C15B8860800104512 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = "<group>"; };
-		4CAD745215B887FD00104512 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
-		4CAD745315B887FD00104512 /* .hgignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .hgignore; sourceTree = "<group>"; };
 		4CAD745615B887FD00104512 /* DDXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElementAdditions.h; sourceTree = "<group>"; };
 		4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLElementAdditions.m; sourceTree = "<group>"; };
 		4CAD745915B887FD00104512 /* NSString+DDXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+DDXML.h"; sourceTree = "<group>"; };
@@ -177,14 +178,13 @@
 		4CAD746015B887FD00104512 /* DDXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLNode.h; sourceTree = "<group>"; };
 		4CAD746115B887FD00104512 /* DDXMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLNode.m; sourceTree = "<group>"; };
 		4CAD746315B887FD00104512 /* DDXMLPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLPrivate.h; sourceTree = "<group>"; };
-		4CAD746415B887FD00104512 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
-		4CAD746515B887FD00104512 /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.markdown; sourceTree = "<group>"; };
 		4CAD748B15B889B700104512 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		4CAD748D15B88AC100104512 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		4CBA981615BA0DB600721965 /* MPDatabaseDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabaseDocument.h; sourceTree = "<group>"; };
 		4CBA981715BA0DB600721965 /* MPDatabaseDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseDocument.m; sourceTree = "<group>"; };
 		4CC6258F15BA1C99002F5B11 /* MPOutlineViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewDelegate.h; sourceTree = "<group>"; };
 		4CC6259015BA1C99002F5B11 /* MPOutlineViewDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineViewDelegate.m; sourceTree = "<group>"; };
+		4CD884B615BD47080042BBF8 /* MainWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -208,6 +208,7 @@
 				4C88763315BABA30003D2CE9 /* PasswordWindow.xib */,
 				4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */,
 				4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */,
+				4CD884B615BD47080042BBF8 /* MainWindow.xib */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -234,11 +235,107 @@
 			name = Model;
 			sourceTree = "<group>";
 		};
+		4C669B2D16760ED100DD0774 /* MiniKeePassLib */ = {
+			isa = PBXGroup;
+			children = (
+				4C669B2F16760ED100DD0774 /* IOStream */,
+				4C669B4C16760ED100DD0774 /* KeePassLib */,
+			);
+			path = MiniKeePassLib;
+			sourceTree = "<group>";
+		};
+		4C669B2F16760ED100DD0774 /* IOStream */ = {
+			isa = PBXGroup;
+			children = (
+				4C669B3016760ED100DD0774 /* AesInputStream.h */,
+				4C669B3116760ED100DD0774 /* AesInputStream.m */,
+				4C669B3216760ED100DD0774 /* AesOutputStream.h */,
+				4C669B3316760ED100DD0774 /* AesOutputStream.m */,
+				4C669B3416760ED100DD0774 /* Arc4RandomStream.h */,
+				4C669B3516760ED100DD0774 /* Arc4RandomStream.m */,
+				4C669B3616760ED100DD0774 /* DataInputStream.h */,
+				4C669B3716760ED100DD0774 /* DataInputStream.m */,
+				4C669B3816760ED100DD0774 /* DataOutputStream.h */,
+				4C669B3916760ED100DD0774 /* DataOutputStream.m */,
+				4C669B3A16760ED100DD0774 /* FileInputStream.h */,
+				4C669B3B16760ED100DD0774 /* FileInputStream.m */,
+				4C669B3C16760ED100DD0774 /* FileOutputStream.h */,
+				4C669B3D16760ED100DD0774 /* FileOutputStream.m */,
+				4C669B3E16760ED100DD0774 /* GZipInputStream.h */,
+				4C669B3F16760ED100DD0774 /* GZipInputStream.m */,
+				4C669B4016760ED100DD0774 /* GZipOutputStream.h */,
+				4C669B4116760ED100DD0774 /* GZipOutputStream.m */,
+				4C669B4216760ED100DD0774 /* HashedInputStream.h */,
+				4C669B4316760ED100DD0774 /* HashedInputStream.m */,
+				4C669B4416760ED100DD0774 /* HashedOutputStream.h */,
+				4C669B4516760ED100DD0774 /* HashedOutputStream.m */,
+				4C669B4616760ED100DD0774 /* InputStream.h */,
+				4C669B4716760ED100DD0774 /* InputStream.m */,
+				4C669B4816760ED100DD0774 /* OutputStream.h */,
+				4C669B4916760ED100DD0774 /* OutputStream.m */,
+				4C669B4A16760ED100DD0774 /* Sha256OutputStream.h */,
+				4C669B4B16760ED100DD0774 /* Sha256OutputStream.m */,
+			);
+			path = IOStream;
+			sourceTree = "<group>";
+		};
+		4C669B4C16760ED100DD0774 /* KeePassLib */ = {
+			isa = PBXGroup;
+			children = (
+				4C669B4F16760ED100DD0774 /* Base64.h */,
+				4C669B5016760ED100DD0774 /* Base64.m */,
+				4C669B5116760ED100DD0774 /* DDXMLDocument+MKPAdditions.h */,
+				4C669B5216760ED100DD0774 /* DDXMLDocument+MKPAdditions.m */,
+				4C669B5316760ED100DD0774 /* DDXMLElement+MKPAdditions.h */,
+				4C669B5416760ED100DD0774 /* DDXMLElement+MKPAdditions.m */,
+				4C669B5516760ED100DD0774 /* Kdb.h */,
+				4C669B5616760ED100DD0774 /* Kdb.m */,
+				4C669B5716760ED100DD0774 /* Kdb3Date.h */,
+				4C669B5816760ED100DD0774 /* Kdb3Date.m */,
+				4C669B5916760ED100DD0774 /* Kdb3Node.h */,
+				4C669B5A16760ED100DD0774 /* Kdb3Node.m */,
+				4C669B5B16760ED100DD0774 /* Kdb3Reader.h */,
+				4C669B5C16760ED100DD0774 /* Kdb3Reader.m */,
+				4C669B5D16760ED100DD0774 /* Kdb3Utils.h */,
+				4C669B5E16760ED100DD0774 /* Kdb3Utils.m */,
+				4C669B5F16760ED100DD0774 /* Kdb3Writer.h */,
+				4C669B6016760ED100DD0774 /* Kdb3Writer.m */,
+				4C669B6116760ED100DD0774 /* Kdb4Node.h */,
+				4C669B6216760ED100DD0774 /* Kdb4Node.m */,
+				4C669B6316760ED100DD0774 /* Kdb4Parser.h */,
+				4C669B6416760ED100DD0774 /* Kdb4Parser.m */,
+				4C669B6516760ED100DD0774 /* Kdb4Persist.h */,
+				4C669B6616760ED100DD0774 /* Kdb4Persist.m */,
+				4C669B6716760ED100DD0774 /* Kdb4Reader.h */,
+				4C669B6816760ED100DD0774 /* Kdb4Reader.m */,
+				4C669B6916760ED100DD0774 /* Kdb4Writer.h */,
+				4C669B6A16760ED100DD0774 /* Kdb4Writer.m */,
+				4C669B6B16760ED100DD0774 /* KdbLib.h */,
+				4C669B6C16760ED100DD0774 /* KdbPassword.h */,
+				4C669B6D16760ED100DD0774 /* KdbPassword.m */,
+				4C669B6E16760ED100DD0774 /* KdbReader.h */,
+				4C669B6F16760ED100DD0774 /* KdbReaderFactory.h */,
+				4C669B7016760ED100DD0774 /* KdbReaderFactory.m */,
+				4C669B7116760ED100DD0774 /* KdbWriter.h */,
+				4C669B7216760ED100DD0774 /* KdbWriterFactory.h */,
+				4C669B7316760ED100DD0774 /* KdbWriterFactory.m */,
+				4C669B7416760ED100DD0774 /* RandomStream.h */,
+				4C669B7516760ED100DD0774 /* RandomStream.m */,
+				4C669B7616760ED100DD0774 /* Salsa20RandomStream.h */,
+				4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */,
+				4C669B7816760ED100DD0774 /* Utils.h */,
+				4C669B7916760ED100DD0774 /* Utils.m */,
+				4C669B7A16760ED100DD0774 /* UUID.h */,
+				4C669B7B16760ED100DD0774 /* UUID.m */,
+			);
+			path = KeePassLib;
+			sourceTree = "<group>";
+		};
 		4C77E35715B84A240093A587 = {
 			isa = PBXGroup;
 			children = (
+				4C669B2D16760ED100DD0774 /* MiniKeePassLib */,
 				4CAD745115B887FD00104512 /* KissXML */,
-				4CAD73E315B8860800104512 /* KeePassLib */,
 				4C77E36C15B84A240093A587 /* MacPass */,
 				4C77E36515B84A240093A587 /* Frameworks */,
 				4C77E36315B84A240093A587 /* Products */,
@@ -307,6 +404,8 @@
 				4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */,
 				4CA0B2FA15BCAF8600654E32 /* MPSettingsController.h */,
 				4CA0B2FB15BCAF8600654E32 /* MPSettingsController.m */,
+				4C83814015BF4677001AE468 /* MPMainWindowController.h */,
+				4C83814115BF4677001AE468 /* MPMainWindowController.m */,
 			);
 			name = Controller;
 			sourceTree = "<group>";
@@ -326,92 +425,10 @@
 			name = General;
 			sourceTree = "<group>";
 		};
-		4CAD73E315B8860800104512 /* KeePassLib */ = {
-			isa = PBXGroup;
-			children = (
-				4CAD73E515B8860800104512 /* AesInputStream.h */,
-				4CAD73E615B8860800104512 /* AesInputStream.m */,
-				4CAD73E715B8860800104512 /* AesOutputStream.h */,
-				4CAD73E815B8860800104512 /* AesOutputStream.m */,
-				4CAD73E915B8860800104512 /* Arc4RandomStream.h */,
-				4CAD73EA15B8860800104512 /* Arc4RandomStream.m */,
-				4CAD73EB15B8860800104512 /* Base64.h */,
-				4CAD73EC15B8860800104512 /* Base64.m */,
-				4CAD73ED15B8860800104512 /* DataInputStream.h */,
-				4CAD73EE15B8860800104512 /* DataInputStream.m */,
-				4CAD73EF15B8860800104512 /* DataOutputStream.h */,
-				4CAD73F015B8860800104512 /* DataOutputStream.m */,
-				4CAD73F115B8860800104512 /* FileInputStream.h */,
-				4CAD73F215B8860800104512 /* FileInputStream.m */,
-				4CAD73F315B8860800104512 /* FileOutputStream.h */,
-				4CAD73F415B8860800104512 /* FileOutputStream.m */,
-				4CAD73F515B8860800104512 /* GZipInputStream.h */,
-				4CAD73F615B8860800104512 /* GZipInputStream.m */,
-				4CAD73F715B8860800104512 /* GZipOutputStream.h */,
-				4CAD73F815B8860800104512 /* GZipOutputStream.m */,
-				4CAD73F915B8860800104512 /* HashedInputStream.h */,
-				4CAD73FA15B8860800104512 /* HashedInputStream.m */,
-				4CAD73FB15B8860800104512 /* HashedOutputStream.h */,
-				4CAD73FC15B8860800104512 /* HashedOutputStream.m */,
-				4CAD73FD15B8860800104512 /* InputStream.h */,
-				4CAD73FE15B8860800104512 /* InputStream.m */,
-				4CAD73FF15B8860800104512 /* Kdb.h */,
-				4CAD740015B8860800104512 /* Kdb.m */,
-				4CAD740115B8860800104512 /* Kdb3Date.h */,
-				4CAD740215B8860800104512 /* Kdb3Date.m */,
-				4CAD740315B8860800104512 /* Kdb3Node.h */,
-				4CAD740415B8860800104512 /* Kdb3Node.m */,
-				4CAD740515B8860800104512 /* Kdb3Parser.h */,
-				4CAD740615B8860800104512 /* Kdb3Parser.m */,
-				4CAD740715B8860800104512 /* Kdb3Persist.h */,
-				4CAD740815B8860800104512 /* Kdb3Persist.m */,
-				4CAD740915B8860800104512 /* Kdb3Reader.h */,
-				4CAD740A15B8860800104512 /* Kdb3Reader.m */,
-				4CAD740B15B8860800104512 /* Kdb3Writer.h */,
-				4CAD740C15B8860800104512 /* Kdb3Writer.m */,
-				4CAD740D15B8860800104512 /* Kdb4Node.h */,
-				4CAD740E15B8860800104512 /* Kdb4Node.m */,
-				4CAD740F15B8860800104512 /* Kdb4Parser.h */,
-				4CAD741015B8860800104512 /* Kdb4Parser.m */,
-				4CAD741115B8860800104512 /* Kdb4Persist.h */,
-				4CAD741215B8860800104512 /* Kdb4Persist.m */,
-				4CAD741315B8860800104512 /* Kdb4Reader.h */,
-				4CAD741415B8860800104512 /* Kdb4Reader.m */,
-				4CAD741515B8860800104512 /* Kdb4Writer.h */,
-				4CAD741615B8860800104512 /* Kdb4Writer.m */,
-				4CAD741715B8860800104512 /* KdbLib.h */,
-				4CAD741815B8860800104512 /* KdbPassword.h */,
-				4CAD741915B8860800104512 /* KdbPassword.m */,
-				4CAD741A15B8860800104512 /* KdbReader.h */,
-				4CAD741B15B8860800104512 /* KdbReaderFactory.h */,
-				4CAD741C15B8860800104512 /* KdbReaderFactory.m */,
-				4CAD741D15B8860800104512 /* KdbWriter.h */,
-				4CAD741E15B8860800104512 /* KdbWriterFactory.h */,
-				4CAD741F15B8860800104512 /* KdbWriterFactory.m */,
-				4CAD742015B8860800104512 /* OutputStream.h */,
-				4CAD742115B8860800104512 /* OutputStream.m */,
-				4CAD742215B8860800104512 /* RandomStream.h */,
-				4CAD742315B8860800104512 /* RandomStream.m */,
-				4CAD742515B8860800104512 /* Salsa20RandomStream.h */,
-				4CAD742615B8860800104512 /* Salsa20RandomStream.m */,
-				4CAD742715B8860800104512 /* Sha256OutputStream.h */,
-				4CAD742815B8860800104512 /* Sha256OutputStream.m */,
-				4CAD742915B8860800104512 /* Utils.h */,
-				4CAD742A15B8860800104512 /* Utils.m */,
-				4CAD742B15B8860800104512 /* UUID.h */,
-				4CAD742C15B8860800104512 /* UUID.m */,
-			);
-			path = KeePassLib;
-			sourceTree = "<group>";
-		};
 		4CAD745115B887FD00104512 /* KissXML */ = {
 			isa = PBXGroup;
 			children = (
-				4CAD745215B887FD00104512 /* .gitignore */,
-				4CAD745315B887FD00104512 /* .hgignore */,
 				4CAD745415B887FD00104512 /* KissXML */,
-				4CAD746415B887FD00104512 /* LICENSE.txt */,
-				4CAD746515B887FD00104512 /* README.markdown */,
 			);
 			path = KissXML;
 			sourceTree = "<group>";
@@ -486,7 +503,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0440;
 				ORGANIZATIONNAME = "HicknHack Software GmbH";
 			};
 			buildConfigurationList = 4C77E35C15B84A240093A587 /* Build configuration list for PBXProject "MacPass" */;
@@ -515,13 +532,10 @@
 				4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */,
 				4C77E37715B84A240093A587 /* Credits.rtf in Resources */,
 				4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */,
-				4CAD747915B887FD00104512 /* .gitignore in Resources */,
-				4CAD747A15B887FD00104512 /* .hgignore in Resources */,
-				4CAD748015B887FD00104512 /* LICENSE.txt in Resources */,
-				4CAD748115B887FD00104512 /* README.markdown in Resources */,
 				4C88763415BABA30003D2CE9 /* PasswordWindow.xib in Resources */,
 				4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */,
 				4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */,
+				4CD884B715BD47080042BBF8 /* MainWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -534,40 +548,6 @@
 			files = (
 				4C77E37315B84A240093A587 /* main.m in Sources */,
 				4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */,
-				4CAD742E15B8860800104512 /* AesInputStream.m in Sources */,
-				4CAD742F15B8860800104512 /* AesOutputStream.m in Sources */,
-				4CAD743015B8860800104512 /* Arc4RandomStream.m in Sources */,
-				4CAD743115B8860800104512 /* Base64.m in Sources */,
-				4CAD743215B8860800104512 /* DataInputStream.m in Sources */,
-				4CAD743315B8860800104512 /* DataOutputStream.m in Sources */,
-				4CAD743415B8860800104512 /* FileInputStream.m in Sources */,
-				4CAD743515B8860800104512 /* FileOutputStream.m in Sources */,
-				4CAD743615B8860800104512 /* GZipInputStream.m in Sources */,
-				4CAD743715B8860800104512 /* GZipOutputStream.m in Sources */,
-				4CAD743815B8860800104512 /* HashedInputStream.m in Sources */,
-				4CAD743915B8860800104512 /* HashedOutputStream.m in Sources */,
-				4CAD743A15B8860800104512 /* InputStream.m in Sources */,
-				4CAD743B15B8860800104512 /* Kdb.m in Sources */,
-				4CAD743C15B8860800104512 /* Kdb3Date.m in Sources */,
-				4CAD743D15B8860800104512 /* Kdb3Node.m in Sources */,
-				4CAD743E15B8860800104512 /* Kdb3Parser.m in Sources */,
-				4CAD743F15B8860800104512 /* Kdb3Persist.m in Sources */,
-				4CAD744015B8860800104512 /* Kdb3Reader.m in Sources */,
-				4CAD744115B8860800104512 /* Kdb3Writer.m in Sources */,
-				4CAD744215B8860800104512 /* Kdb4Node.m in Sources */,
-				4CAD744315B8860800104512 /* Kdb4Parser.m in Sources */,
-				4CAD744415B8860800104512 /* Kdb4Persist.m in Sources */,
-				4CAD744515B8860800104512 /* Kdb4Reader.m in Sources */,
-				4CAD744615B8860800104512 /* Kdb4Writer.m in Sources */,
-				4CAD744715B8860800104512 /* KdbPassword.m in Sources */,
-				4CAD744815B8860800104512 /* KdbReaderFactory.m in Sources */,
-				4CAD744915B8860800104512 /* KdbWriterFactory.m in Sources */,
-				4CAD744A15B8860800104512 /* OutputStream.m in Sources */,
-				4CAD744B15B8860800104512 /* RandomStream.m in Sources */,
-				4CAD744D15B8860800104512 /* Salsa20RandomStream.m in Sources */,
-				4CAD744E15B8860800104512 /* Sha256OutputStream.m in Sources */,
-				4CAD744F15B8860800104512 /* Utils.m in Sources */,
-				4CAD745015B8860800104512 /* UUID.m in Sources */,
 				4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */,
 				4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */,
 				4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */,
@@ -578,6 +558,42 @@
 				4CC6259115BA1C99002F5B11 /* MPOutlineViewDelegate.m in Sources */,
 				4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */,
 				4CA0B2FC15BCAF8600654E32 /* MPSettingsController.m in Sources */,
+				4C83814215BF4677001AE468 /* MPMainWindowController.m in Sources */,
+				4C669B7F16760ED100DD0774 /* AesInputStream.m in Sources */,
+				4C669B8016760ED100DD0774 /* AesOutputStream.m in Sources */,
+				4C669B8116760ED100DD0774 /* Arc4RandomStream.m in Sources */,
+				4C669B8216760ED100DD0774 /* DataInputStream.m in Sources */,
+				4C669B8316760ED100DD0774 /* DataOutputStream.m in Sources */,
+				4C669B8416760ED100DD0774 /* FileInputStream.m in Sources */,
+				4C669B8516760ED100DD0774 /* FileOutputStream.m in Sources */,
+				4C669B8616760ED100DD0774 /* GZipInputStream.m in Sources */,
+				4C669B8716760ED100DD0774 /* GZipOutputStream.m in Sources */,
+				4C669B8816760ED100DD0774 /* HashedInputStream.m in Sources */,
+				4C669B8916760ED100DD0774 /* HashedOutputStream.m in Sources */,
+				4C669B8A16760ED100DD0774 /* InputStream.m in Sources */,
+				4C669B8B16760ED100DD0774 /* OutputStream.m in Sources */,
+				4C669B8C16760ED100DD0774 /* Sha256OutputStream.m in Sources */,
+				4C669B8E16760ED100DD0774 /* Base64.m in Sources */,
+				4C669B8F16760ED100DD0774 /* DDXMLDocument+MKPAdditions.m in Sources */,
+				4C669B9016760ED100DD0774 /* DDXMLElement+MKPAdditions.m in Sources */,
+				4C669B9116760ED100DD0774 /* Kdb.m in Sources */,
+				4C669B9216760ED100DD0774 /* Kdb3Date.m in Sources */,
+				4C669B9316760ED100DD0774 /* Kdb3Node.m in Sources */,
+				4C669B9416760ED100DD0774 /* Kdb3Reader.m in Sources */,
+				4C669B9516760ED100DD0774 /* Kdb3Utils.m in Sources */,
+				4C669B9616760ED100DD0774 /* Kdb3Writer.m in Sources */,
+				4C669B9716760ED100DD0774 /* Kdb4Node.m in Sources */,
+				4C669B9816760ED100DD0774 /* Kdb4Parser.m in Sources */,
+				4C669B9916760ED100DD0774 /* Kdb4Persist.m in Sources */,
+				4C669B9A16760ED100DD0774 /* Kdb4Reader.m in Sources */,
+				4C669B9B16760ED100DD0774 /* Kdb4Writer.m in Sources */,
+				4C669B9C16760ED100DD0774 /* KdbPassword.m in Sources */,
+				4C669B9D16760ED100DD0774 /* KdbReaderFactory.m in Sources */,
+				4C669B9E16760ED100DD0774 /* KdbWriterFactory.m in Sources */,
+				4C669B9F16760ED100DD0774 /* RandomStream.m in Sources */,
+				4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */,
+				4C669BA116760ED100DD0774 /* Utils.m in Sources */,
+				4C669BA216760ED100DD0774 /* UUID.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -636,7 +652,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lxml2";
-				SDKROOT = macosx;
+				SDKROOT = macosx10.7;
 			};
 			name = Debug;
 		};
@@ -658,13 +674,14 @@
 				HEADER_SEARCH_PATHS = "/usr/include/libxml2/**";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_LDFLAGS = "-lxml2";
-				SDKROOT = macosx;
+				SDKROOT = macosx10.7;
 			};
 			name = Release;
 		};
 		4C77E38115B84A240093A587 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch";
 				INFOPLIST_FILE = "MacPass/MacPass-Info.plist";
@@ -676,6 +693,7 @@
 		4C77E38215B84A240093A587 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch";
 				INFOPLIST_FILE = "MacPass/MacPass-Info.plist";

MacPass/MPAppDelegate.h

@@ -8,14 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-APPKIT_EXTERN NSString *const kOutlineViewIdentifier;
-
 @class MPDatabaseDocument;
 
 @interface MPAppDelegate : NSObject <NSApplicationDelegate>
 
-@property (assign) IBOutlet NSWindow *window;
 
-@property (readonly, retain) MPDatabaseDocument *database;
+@end
-
-@end

MacPass/MPAppDelegate.m

@@ -8,46 +8,21 @@
 
 #import "MPAppDelegate.h"
 
-#import "MPDatabaseDocument.h"
+#import "MPMainWindowController.h"
-#import "MPOutlineDataSource.h"
-#import "MPOutlineViewDelegate.h"
 #import "MPSettingsController.h"
 
-NSString *const kColumnIdentifier = @"OutlineColumn";
-NSString *const kOutlineViewIdentifier = @"OutlineView";
-
 @interface MPAppDelegate ()
-@property (assign) IBOutlet NSOutlineView *outlineView;
 @property (retain) MPSettingsController *settingsController;
-@property (retain) MPOutlineDataSource *datasource;
+@property (retain) MPMainWindowController *mainWindowController;
-@property (retain) MPOutlineViewDelegate *outlineDelegate;
-@property (retain) MPDatabaseDocument *database;
-- (void)updateData;
 - (IBAction)showPreferences:(id)sender;
 @end
 
 @implementation MPAppDelegate
 
-@synthesize outlineView = _outlineView;
-@synthesize window = _window;
-@synthesize database = _database;
-@synthesize outlineDelegate = _outlineDelegate;
-@synthesize datasource = _datasource;
-@synthesize settingsController = _settingsController;
-
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-  _outlineDelegate = [[MPOutlineViewDelegate alloc] init];
+  _mainWindowController = [[MPMainWindowController alloc] init];
-  _datasource = [[MPOutlineDataSource alloc] init];
+  [_mainWindowController showWindow:[_mainWindowController window]];
-  [[_outlineView outlineTableColumn] setIdentifier:kColumnIdentifier];
-  [_outlineView setDelegate:_outlineDelegate];
-  [_outlineView setDataSource:_datasource];  
-  // register for sucessfull document loads
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateData) name:MPDidLoadDataBaseNotification object:_database];
-}
-
-- (void)updateData {
-  [_outlineView reloadData];
 }
 
 #pragma mark IBActions
@@ -56,7 +31,6 @@ NSString *const kOutlineViewIdentifier = @"OutlineView";
     _settingsController = [[MPSettingsController alloc] init];
   }
   [_settingsController showWindow:_settingsController.window];
-  
 }
 
 @end

MacPass/MPDatabaseDocument.m

@@ -17,8 +17,6 @@ NSString *const MPDidLoadDataBaseNotification = @"DidLoadDataBaseNotification";
 
 @implementation MPDatabaseDocument
 
-@synthesize tree = _tree;
-
 - (id)init {
   // no appropriate init method
   return nil;

MacPass/MPGeneralSettingsController.m

@@ -16,7 +16,6 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
 @end
 
 @implementation MPGeneralSettingsController
-@synthesize encodingPopup = _encodingPopup;
 
 + (NSString *)identifier {
   return MPGeneralSetingsIdentifier;

MacPass/MPMainWindowController.h

@@ -0,0 +1,15 @@
+//
+//  MPMainWindowController.h
+//  MacPass
+//
+//  Created by Michael Starke on 24.07.12.
+//  Copyright (c) 2012 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@class MPDatabaseDocument;
+
+@interface MPMainWindowController : NSWindowController
+@property (readonly, retain) MPDatabaseDocument *database;
+@end

MacPass/MPMainWindowController.m

@@ -0,0 +1,62 @@
+//
+//  MPMainWindowController.m
+//  MacPass
+//
+//  Created by Michael Starke on 24.07.12.
+//  Copyright (c) 2012 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPMainWindowController.h"
+#import "MPOutlineDataSource.h"
+#import "MPOutlineViewDelegate.h"
+#import "MPDatabaseDocument.h"
+
+NSString *const kColumnIdentifier = @"OutlineColumn";
+NSString *const kOutlineViewIdentifier = @"OutlineView";
+
+
+@interface MPMainWindowController ()
+@property (assign) IBOutlet NSOutlineView *outlineView;
+@property (retain) MPOutlineDataSource *datasource;
+@property (retain) MPOutlineViewDelegate *outlineDelegate;
+@property (retain) MPDatabaseDocument *database;
+- (void)updateData;
+@end
+
+@implementation MPMainWindowController
+
+
+-(id)init {
+  return [super initWithWindowNibName:@"MainWindow" owner:self];
+}
+
+- (void)windowDidLoad
+{
+  [super windowDidLoad];
+  
+  _outlineDelegate = [[MPOutlineViewDelegate alloc] init];
+  _datasource = [[MPOutlineDataSource alloc] init];
+  [[_outlineView outlineTableColumn] setIdentifier:kColumnIdentifier];
+  [_outlineView setDelegate:_outlineDelegate];
+  [_outlineView setDataSource:_datasource];  
+  // register for sucessfull document loads
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateData) name:MPDidLoadDataBaseNotification object:_database];
+}
+
+- (void)updateData {
+  [_outlineView reloadData];
+}
+
+- (void)newDocument:(id)sender {
+  NSLog(@"New");
+}
+
+- (void)performClose:(id)sender {
+  NSLog(@"Close");
+}
+
+- (void)openDocument:(id)sender {
+  NSLog(@"OpenDocument");
+}
+
+@end

MacPass/MPSettingsController.m

@@ -16,7 +16,6 @@ NSString const* kMPPasswordEnvodingSettingsKey = @"PasswordEncoding";
 @end
 
 @implementation MPSettingsController
-@synthesize generalController = _generalController;
 
 -(id)init {
   self = [super initWithWindowNibName:@"SettingsWindow"];

MacPass/PasswordWindow.xib

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1070</int>
+		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.SystemVersion">12C60</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2844</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.AppKitVersion">1187.34</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<string key="IBDocument.HIToolboxVersion">625.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2844</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSWindowTemplate</string>
-			<string>NSView</string>
 			<string>NSCustomObject</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -35,7 +35,7 @@
 			<object class="NSWindowTemplate" id="406222252">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 207}, {480, 270}}</string>
+				<string key="NSWindowRect">{{196, 207}, {482, 258}}</string>
 				<int key="NSWTFlags">611845120</int>
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -44,12 +44,12 @@
 				<object class="NSView" key="NSWindowView" id="805694289">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{480, 270}</string>
+					<string key="NSFrameSize">{482, 258}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView"/>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -101,6 +101,8 @@
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="293.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="YES" key="293.IBNSWindowAutoPositionCentersVertical"/>
 				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="293.NSWindowTemplate.visibleAtLaunch"/>
 				<string key="294.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>

MacPass/en.lproj/MainMenu.xib

@@ -11,23 +11,9 @@
 			<string key="NS.object.0">2182</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSScroller</string>
-			<string>NSSplitView</string>
-			<string>NSMenuItem</string>
 			<string>NSMenu</string>
-			<string>NSScrollView</string>
+			<string>NSMenuItem</string>
-			<string>NSTextFieldCell</string>
-			<string>NSImageView</string>
-			<string>NSImageCell</string>
-			<string>IBNSLayoutConstraint</string>
-			<string>NSTableCellView</string>
-			<string>NSOutlineView</string>
-			<string>NSCustomView</string>
 			<string>NSCustomObject</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-			<string>NSTableColumn</string>
-			<string>NSTextField</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -824,219 +810,6 @@
 				</array>
 				<string key="NSName">_NSMainMenu</string>
 			</object>
-			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{476, 342}, {724, 501}}</string>
-				<int key="NSWTFlags">1954021376</int>
-				<string key="NSWindowTitle">MacPass</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="439893737">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSSplitView" id="221828200">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSScrollView" id="758684367">
-									<reference key="NSNextResponder" ref="221828200"/>
-									<int key="NSvFlags">268</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSClipView" id="359946026">
-											<reference key="NSNextResponder" ref="758684367"/>
-											<int key="NSvFlags">2304</int>
-											<array class="NSMutableArray" key="NSSubviews">
-												<object class="NSOutlineView" id="326489198">
-													<reference key="NSNextResponder" ref="359946026"/>
-													<int key="NSvFlags">256</int>
-													<string key="NSFrameSize">{142, 499}</string>
-													<reference key="NSSuperview" ref="359946026"/>
-													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="713749969"/>
-													<string key="NSReuseIdentifierKey">_NS:13</string>
-													<bool key="NSEnabled">YES</bool>
-													<object class="_NSCornerView" key="NSCornerView">
-														<nil key="NSNextResponder"/>
-														<int key="NSvFlags">-2147483392</int>
-														<string key="NSFrame">{{224, 0}, {16, 17}}</string>
-														<string key="NSReuseIdentifierKey">_NS:16</string>
-													</object>
-													<array class="NSMutableArray" key="NSTableColumns">
-														<object class="NSTableColumn" id="742390205">
-															<string key="NSIdentifier">AutomaticTableColumnIdentifier.0</string>
-															<double key="NSWidth">139</double>
-															<double key="NSMinWidth">16</double>
-															<double key="NSMaxWidth">1000</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents"/>
-																<object class="NSFont" key="NSSupport">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">11</double>
-																	<int key="NSfFlags">3100</int>
-																</object>
-																<object class="NSColor" key="NSBackgroundColor">
-																	<int key="NSColorSpace">3</int>
-																	<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
-																</object>
-																<object class="NSColor" key="NSTextColor">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">headerTextColor</string>
-																	<object class="NSColor" key="NSColor" id="118103638">
-																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MAA</bytes>
-																	</object>
-																</object>
-															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="527978776">
-																<int key="NSCellFlags">337772096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents">Text Cell</string>
-																<object class="NSFont" key="NSSupport" id="379457402">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">13</double>
-																	<int key="NSfFlags">1044</int>
-																</object>
-																<reference key="NSControlView" ref="326489198"/>
-																<object class="NSColor" key="NSBackgroundColor" id="682773928">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">controlBackgroundColor</string>
-																	<object class="NSColor" key="NSColor" id="982119450">
-																		<int key="NSColorSpace">3</int>
-																		<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-																	</object>
-																</object>
-																<object class="NSColor" key="NSTextColor" id="1014149275">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">controlTextColor</string>
-																	<reference key="NSColor" ref="118103638"/>
-																</object>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="326489198"/>
-														</object>
-													</array>
-													<double key="NSIntercellSpacingWidth">3</double>
-													<double key="NSIntercellSpacingHeight">0.0</double>
-													<object class="NSColor" key="NSBackgroundColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">_sourceListBackgroundColor</string>
-														<object class="NSColor" key="NSColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">alternateSelectedControlColor</string>
-															<object class="NSColor" key="NSColor">
-																<int key="NSColorSpace">1</int>
-																<bytes key="NSRGB">MCAwIDEAA</bytes>
-															</object>
-														</object>
-													</object>
-													<object class="NSColor" key="NSGridColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">gridColor</string>
-														<object class="NSColor" key="NSColor">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC41AA</bytes>
-														</object>
-													</object>
-													<double key="NSRowHeight">17</double>
-													<int key="NSTvFlags">-767557632</int>
-													<reference key="NSDelegate"/>
-													<reference key="NSDataSource"/>
-													<int key="NSColumnAutoresizingStyle">4</int>
-													<int key="NSDraggingSourceMaskForLocal">15</int>
-													<int key="NSDraggingSourceMaskForNonLocal">0</int>
-													<bool key="NSAllowsTypeSelect">YES</bool>
-													<int key="NSTableViewSelectionHighlightStyle">1</int>
-													<int key="NSTableViewDraggingDestinationStyle">1</int>
-													<int key="NSTableViewGroupRowStyle">1</int>
-												</object>
-											</array>
-											<string key="NSFrame">{{1, 1}, {142, 499}}</string>
-											<reference key="NSSuperview" ref="758684367"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="326489198"/>
-											<string key="NSReuseIdentifierKey">_NS:11</string>
-											<reference key="NSDocView" ref="326489198"/>
-											<reference key="NSBGColor" ref="682773928"/>
-											<int key="NScvFlags">4</int>
-										</object>
-										<object class="NSScroller" id="819720148">
-											<reference key="NSNextResponder" ref="758684367"/>
-											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-											<reference key="NSSuperview" ref="758684367"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="795234688"/>
-											<string key="NSReuseIdentifierKey">_NS:15</string>
-											<reference key="NSTarget" ref="758684367"/>
-											<string key="NSAction">_doScroller:</string>
-											<double key="NSPercent">0.99749373433583954</double>
-										</object>
-										<object class="NSScroller" id="795234688">
-											<reference key="NSNextResponder" ref="758684367"/>
-											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{1, 485}, {122, 15}}</string>
-											<reference key="NSSuperview" ref="758684367"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="436079625"/>
-											<string key="NSReuseIdentifierKey">_NS:60</string>
-											<int key="NSsFlags">1</int>
-											<reference key="NSTarget" ref="758684367"/>
-											<string key="NSAction">_doScroller:</string>
-											<double key="NSPercent">0.54222222222222227</double>
-										</object>
-									</array>
-									<string key="NSFrameSize">{144, 501}</string>
-									<reference key="NSSuperview" ref="221828200"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="359946026"/>
-									<string key="NSReuseIdentifierKey">_NS:9</string>
-									<int key="NSsFlags">133682</int>
-									<reference key="NSVScroller" ref="819720148"/>
-									<reference key="NSHScroller" ref="795234688"/>
-									<reference key="NSContentView" ref="359946026"/>
-									<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
-								</object>
-								<object class="NSCustomView" id="436079625">
-									<reference key="NSNextResponder" ref="221828200"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{145, 0}, {579, 501}}</string>
-									<reference key="NSSuperview" ref="221828200"/>
-									<reference key="NSWindow"/>
-									<string key="NSReuseIdentifierKey">_NS:13</string>
-									<string key="NSClassName">NSView</string>
-								</object>
-							</array>
-							<string key="NSFrameSize">{724, 501}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="758684367"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<bool key="NSIsVertical">YES</bool>
-							<int key="NSDividerStyle">2</int>
-						</object>
-					</array>
-					<string key="NSFrameSize">{724, 501}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="221828200"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1050}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
 			<object class="NSCustomObject" id="976324537">
 				<string key="NSClassName">MPAppDelegate</string>
 			</object>
@@ -1446,22 +1219,6 @@
 					</object>
 					<int key="connectionID">535</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">532</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">outlineView</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="326489198"/>
-					</object>
-					<int key="connectionID">1109</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showPreferences:</string>
@@ -1470,86 +1227,6 @@
 					</object>
 					<int key="connectionID">1175</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">imageView</string>
-						<object class="NSTableCellView" key="source" id="713749969">
-							<nil key="NSNextResponder"/>
-							<int key="NSvFlags">274</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSImageView" id="372772713">
-									<reference key="NSNextResponder" ref="713749969"/>
-									<int key="NSvFlags">268</int>
-									<set class="NSMutableSet" key="NSDragTypes">
-										<string>Apple PDF pasteboard type</string>
-										<string>Apple PICT pasteboard type</string>
-										<string>Apple PNG pasteboard type</string>
-										<string>NSFilenamesPboardType</string>
-										<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-										<string>NeXT TIFF v4.0 pasteboard type</string>
-									</set>
-									<string key="NSFrame">{{3, 0}, {17, 17}}</string>
-									<reference key="NSSuperview" ref="713749969"/>
-									<reference key="NSNextKeyView" ref="619646322"/>
-									<string key="NSReuseIdentifierKey">_NS:11</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSImageCell" key="NSCell" id="111712843">
-										<int key="NSCellFlags">130560</int>
-										<int key="NSCellFlags2">33554432</int>
-										<object class="NSCustomResource" key="NSContents">
-											<string key="NSClassName">NSImage</string>
-											<string key="NSResourceName">NSActionTemplate</string>
-										</object>
-										<string key="NSCellIdentifier">_NS:11</string>
-										<int key="NSAlign">0</int>
-										<int key="NSScale">0</int>
-										<int key="NSStyle">0</int>
-										<bool key="NSAnimates">NO</bool>
-									</object>
-									<bool key="NSEditable">YES</bool>
-								</object>
-								<object class="NSTextField" id="619646322">
-									<reference key="NSNextResponder" ref="713749969"/>
-									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{25, 0}, {114, 17}}</string>
-									<reference key="NSSuperview" ref="713749969"/>
-									<reference key="NSNextKeyView" ref="819720148"/>
-									<string key="NSReuseIdentifierKey">_NS:20</string>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="210006725">
-										<int key="NSCellFlags">67239488</int>
-										<int key="NSCellFlags2">272631808</int>
-										<string key="NSContents">Table View Cell</string>
-										<reference key="NSSupport" ref="379457402"/>
-										<string key="NSCellIdentifier">_NS:20</string>
-										<reference key="NSControlView" ref="619646322"/>
-										<object class="NSColor" key="NSBackgroundColor">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">controlColor</string>
-											<reference key="NSColor" ref="982119450"/>
-										</object>
-										<reference key="NSTextColor" ref="1014149275"/>
-									</object>
-								</object>
-							</array>
-							<string key="NSFrame">{{1, 0}, {139, 17}}</string>
-							<reference key="NSNextKeyView" ref="372772713"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-						</object>
-						<reference key="destination" ref="372772713"/>
-					</object>
-					<int key="connectionID">1166</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField</string>
-						<reference key="source" ref="713749969"/>
-						<reference key="destination" ref="619646322"/>
-					</object>
-					<int key="connectionID">1167</int>
-				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -2062,86 +1739,6 @@
 						<reference key="object" ref="708854459"/>
 						<reference key="parent" ref="698887838"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="972006081"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="439893737"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="439893737"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="221828200"/>
-							<object class="IBNSLayoutConstraint" id="1047738955">
-								<reference key="firstItem" ref="221828200"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<reference key="containingView" ref="439893737"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="212026352">
-								<reference key="firstItem" ref="221828200"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<reference key="containingView" ref="439893737"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="999137662">
-								<reference key="firstItem" ref="221828200"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<reference key="containingView" ref="439893737"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="517985146">
-								<reference key="firstItem" ref="221828200"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<reference key="containingView" ref="439893737"/>
-							</object>
-						</array>
-						<reference key="parent" ref="972006081"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">420</int>
 						<reference key="object" ref="755631768"/>
@@ -2246,309 +1843,13 @@
 						<reference key="object" ref="738670835"/>
 						<reference key="parent" ref="963351320"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">785</int>
-						<reference key="object" ref="221828200"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="436079625"/>
-							<reference ref="758684367"/>
-						</array>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">787</int>
-						<reference key="object" ref="436079625"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="221828200"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">844</int>
-						<reference key="object" ref="212026352"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">847</int>
-						<reference key="object" ref="999137662"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">935</int>
-						<reference key="object" ref="517985146"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">842</int>
-						<reference key="object" ref="1047738955"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1070</int>
-						<reference key="object" ref="758684367"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="819720148"/>
-							<reference ref="795234688"/>
-							<reference ref="326489198"/>
-						</array>
-						<reference key="parent" ref="221828200"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1073</int>
-						<reference key="object" ref="819720148"/>
-						<reference key="parent" ref="758684367"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1072</int>
-						<reference key="object" ref="795234688"/>
-						<reference key="parent" ref="758684367"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1071</int>
-						<reference key="object" ref="326489198"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="742390205"/>
-						</array>
-						<reference key="parent" ref="758684367"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1074</int>
-						<reference key="object" ref="742390205"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="527978776"/>
-							<reference ref="713749969"/>
-						</array>
-						<reference key="parent" ref="326489198"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1075</int>
-						<reference key="object" ref="527978776"/>
-						<reference key="parent" ref="742390205"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1161</int>
-						<reference key="object" ref="713749969"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="372772713"/>
-							<reference ref="619646322"/>
-							<object class="IBNSLayoutConstraint" id="941535850">
-								<reference key="firstItem" ref="619646322"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="372772713"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-								<reference key="containingView" ref="713749969"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="562924775">
-								<reference key="firstItem" ref="619646322"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="372772713"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-								<reference key="containingView" ref="713749969"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="49470970">
-								<reference key="firstItem" ref="372772713"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="619646322"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-								<reference key="containingView" ref="713749969"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="949228382">
-								<reference key="firstItem" ref="372772713"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="713749969"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<reference key="containingView" ref="713749969"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="424736529">
-								<reference key="firstItem" ref="713749969"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="619646322"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">3</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<reference key="containingView" ref="713749969"/>
-							</object>
-							<object class="IBNSLayoutConstraint" id="8060641">
-								<reference key="firstItem" ref="372772713"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="713749969"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-								<reference key="containingView" ref="713749969"/>
-							</object>
-						</array>
-						<reference key="parent" ref="742390205"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1162</int>
-						<reference key="object" ref="372772713"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="111712843"/>
-							<object class="IBNSLayoutConstraint" id="792221937">
-								<reference key="firstItem" ref="372772713"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">17</double>
-								</object>
-								<float key="priority">1000</float>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-								<reference key="containingView" ref="372772713"/>
-							</object>
-						</array>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1163</int>
-						<reference key="object" ref="619646322"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="210006725"/>
-						</array>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1164</int>
-						<reference key="object" ref="210006725"/>
-						<reference key="parent" ref="619646322"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1165</int>
-						<reference key="object" ref="111712843"/>
-						<reference key="parent" ref="372772713"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1168</int>
-						<reference key="object" ref="941535850"/>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1169</int>
-						<reference key="object" ref="562924775"/>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1170</int>
-						<reference key="object" ref="49470970"/>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1171</int>
-						<reference key="object" ref="949228382"/>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1172</int>
-						<reference key="object" ref="424736529"/>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1173</int>
-						<reference key="object" ref="8060641"/>
-						<reference key="parent" ref="713749969"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1174</int>
-						<reference key="object" ref="792221937"/>
-						<reference key="parent" ref="372772713"/>
-					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1070.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1071.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="1071.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
-				<string key="1072.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1073.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1074.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="1074.isInViewBasedMode"/>
-				<array key="1074.prototypeCellViews">
-					<reference ref="713749969"/>
-				</array>
-				<string key="1075.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="1161.IBNSViewMetadataConstraints">
-					<reference ref="941535850"/>
-					<reference ref="562924775"/>
-					<reference ref="49470970"/>
-					<reference ref="949228382"/>
-					<reference ref="424736529"/>
-					<reference ref="8060641"/>
-				</array>
-				<string key="1161.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1161.userInterfaceItemIdentifier">OutlineCell</string>
-				<array key="1162.IBNSViewMetadataConstraints">
-					<reference ref="792221937"/>
-				</array>
-				<boolean value="NO" key="1162.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="1162.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="1163.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="1163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1168.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2605,16 +1906,6 @@
 				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="371.IBWindowTemplateEditedContentRect">{{380, 496}, {480, 360}}</string>
-				<integer value="1" key="371.NSWindowTemplate.visibleAtLaunch"/>
-				<array class="NSMutableArray" key="372.IBNSViewMetadataConstraints">
-					<reference ref="1047738955"/>
-					<reference ref="212026352"/>
-					<reference ref="999137662"/>
-					<reference ref="517985146"/>
-				</array>
-				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2643,18 +1934,11 @@
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="785.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="785.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="787.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="842.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="844.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="847.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="935.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
@@ -2678,33 +1962,11 @@
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="outlineView">NSOutlineView</string>
-						<string key="window">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="outlineView">
-							<string key="name">outlineView</string>
-							<string key="candidateClassName">NSOutlineView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/MPAppDelegate.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -2716,7 +1978,6 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSActionTemplate">{15, 15}</string>
 			<string key="NSMenuCheckmark">{11, 11}</string>
 			<string key="NSMenuMixedState">{10, 3}</string>
 		</dictionary>