Commits

Anonymous committed 8bd3a27

1.Add 'Merge' button.
2.Add button which show all files that contain confilct.
3.Add one status which indicate file containing conflict.
4.Add 'Resolve' button.

  • Participants
  • Parent commits de96390
  • Tags 0.7.2

Comments (0)

Files changed (21)

File English.lproj/Repo.strings

 
 /* Class = "NSMenuItem"; title = "Compare With Base"; ObjectID = "300385"; */
 "300385.title" = "Compare With Base";
+
+/* Class = "NSToolbarItem"; label = "Merge"; ObjectID = "300392"; */
+"300392.label" = "Merge";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Merge"; ObjectID = "300392"; */
+"300392.paletteLabel" = "Merge";
+
+/* Class = "NSToolbarItem"; label = "All Conflicts"; ObjectID = "300396"; */
+"300396.label" = "All Conflicts";
+
+/* Class = "NSToolbarItem"; paletteLabel = "All Conflicts"; ObjectID = "300396"; */
+"300396.paletteLabel" = "All Conflicts";
+
+/* Class = "NSToolbarItem"; label = "Resolve"; ObjectID = "300400"; */
+"300400.label" = "Resolve";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Resolve"; ObjectID = "300400"; */
+"300400.paletteLabel" = "Resolve";
+
+/* Class = "NSMenuItem"; title = "Resolve"; ObjectID = "300403"; */
+"300403.title" = "Resolve";
+
+/* Class = "NSMenuItem"; title = "Resolve"; ObjectID = "300405"; */
+"300405.title" = "Resolve";

File English.lproj/Repo.xib

 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">740</string>
+		<string key="IBDocument.InterfaceBuilderVersion">759</string>
 		<string key="IBDocument.AppKitVersion">1038.25</string>
 		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>740</string>
-				<string>1.2.2</string>
+				<string>759</string>
+				<string>1.2.5</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="300028"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>2BA1FD10-2040-495D-A6D9-99D59659AB5C</string>
 							<string>42971148-A858-4F48-87CB-1F14BC0155B9</string>
 							<string>5B80517C-BF8F-4C2C-9F32-319D5DA67AE7</string>
+							<string>61DE3A4D-3CDA-44D0-9A79-FD07FA244704</string>
 							<string>67DF7834-9D0C-4983-AC3B-403E9825A205</string>
 							<string>67E33ADD-9574-4778-832E-CF60F8AD1B43</string>
+							<string>6F1B139D-8737-4231-97F2-A2EFCE50DF04</string>
 							<string>707D3CBA-142C-4402-A827-77759FCD5F93</string>
 							<string>A9460837-B3E5-4D8F-BA2F-2EE2DA11822A</string>
 							<string>B3D7AD46-B9E4-47B2-BA06-00D19C26908D</string>
+							<string>BA86731B-DDAF-43A5-AF21-374A4ABB9285</string>
 							<string>BB5C4395-94C4-4CD3-8D92-FE301B9CB201</string>
 							<string>C38A20A2-4F31-4A99-A8E1-CFCF7586E73D</string>
 							<string>C9CBFCAD-9F31-4BA8-9148-F992516001A5</string>
 								<bool key="NSToolbarIsUserRemovable">YES</bool>
 								<int key="NSToolbarItemVisibilityPriority">0</int>
 							</object>
+							<object class="NSToolbarItem" id="720927437">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">61DE3A4D-3CDA-44D0-9A79-FD07FA244704</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Merge</string>
+								<string key="NSToolbarItemPaletteLabel">Merge</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">toolbar_merge</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
 							<object class="NSToolbarItem" id="641496510">
 								<object class="NSMutableString" key="NSToolbarItemIdentifier">
 									<characters key="NS.bytes">67DF7834-9D0C-4983-AC3B-403E9825A205</characters>
 								<bool key="NSToolbarIsUserRemovable">YES</bool>
 								<int key="NSToolbarItemVisibilityPriority">0</int>
 							</object>
+							<object class="NSToolbarItem" id="1070855580">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">6F1B139D-8737-4231-97F2-A2EFCE50DF04</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Resolve</string>
+								<string key="NSToolbarItemPaletteLabel">Resolve</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">toolbar_resolve</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
 							<object class="NSToolbarItem" id="749623439">
 								<object class="NSMutableString" key="NSToolbarItemIdentifier">
 									<characters key="NS.bytes">707D3CBA-142C-4402-A827-77759FCD5F93</characters>
 								<bool key="NSToolbarIsUserRemovable">YES</bool>
 								<int key="NSToolbarItemVisibilityPriority">0</int>
 							</object>
+							<object class="NSToolbarItem" id="475940907">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">BA86731B-DDAF-43A5-AF21-374A4ABB9285</characters>
+								</object>
+								<string key="NSToolbarItemLabel">All Conflicts</string>
+								<string key="NSToolbarItemPaletteLabel">All Conflicts</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">toolbar_allconflicts</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
 							<object class="NSToolbarItem" id="523879486">
 								<object class="NSMutableString" key="NSToolbarItemIdentifier">
 									<characters key="NS.bytes">BB5C4395-94C4-4CD3-8D92-FE301B9CB201</characters>
 							</object>
 						</object>
 					</object>
-					<object class="NSArray" key="NSToolbarIBAllowedItems">
+					<object class="NSMutableArray" key="NSToolbarIBAllowedItems">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<reference ref="523879486"/>
 						<reference ref="656707464"/>
 						<reference ref="58798876"/>
 						<reference ref="809537166"/>
 						<reference ref="398565235"/>
+						<reference ref="720927437"/>
+						<reference ref="475940907"/>
+						<reference ref="1070855580"/>
 					</object>
 					<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 															<int key="NSvFlags">256</int>
 															<string key="NSFrameSize">{785, 148}</string>
 															<reference key="NSSuperview" ref="61754055"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTableHeaderView" key="NSHeaderView" id="288602249">
 																<reference key="NSNextResponder" ref="516652966"/>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrameSize">{785, 17}</string>
 																<reference key="NSSuperview" ref="516652966"/>
+																<reference key="NSWindow"/>
 																<reference key="NSTableView" ref="392325734"/>
 															</object>
 															<object class="_NSCornerView" key="NSCornerView" id="656633742">
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{785, 0}, {16, 17}}</string>
 																<reference key="NSSuperview" ref="214279069"/>
+																<reference key="NSWindow"/>
 															</object>
 															<object class="NSMutableArray" key="NSTableColumns">
 																<bool key="EncodedWithXMLCoder">YES</bool>
 																					<integer value="0"/>
 																					<object class="NSCachedImageRep">
 																						<object class="NSData" key="NSTIFFRepresentation">
-																							<bytes key="NS.bytes">TU0AKgAAA6SAACBQOCQWDQeDgGBAEVEsUhU8rVrutFwJ/tWBvyERuOR2ChIAAEAidQGAXrMwJ9olyLMa
-BvKPTGDgMBgIGAQCAUGPl9Pobj0UBIupAoigoIZet9muN/hpttVqtdIPWqMyCQoAgZ/gB/v0CAMCBMTC
-YSkQLBcLiwEAYDh6RAEPAsGAsNuS7BQ6FAHA4dB8DgBZst7gBeOMIgBt4lHNBotE6wN/A/JB4o5VpAYC
-gUHzUBgCaAIABEJhUABAIA4AAKdAB8PJyAAxjxzgB/PJ1ABrNrQOsOlkAKNRKJgrVbLYlP/kPasAYvGU
-yvcfjwiAIOB0P6UHgwAC4WCcAPVlLsAOgJ9dssFKAAgDB7AB+PF3ABvNd6gBwBgxgBYrFZOhTlQVAVoG
-+KBi4LYuHaLgvC+CQjiMIiCnufB/AAcRDEUABygmBYABGF5sAAB4Fn29x5HYAB2HEegAGkfAfgAYRqHM
-f5KksS0BIEa6CCwK4rmoKIpCkFYrSIAB5nqrZ0G4WgAGMZz4gOaJXgAJAug2AB4HGcIAAUBACgAfZ6Pq
-YpuhAAB2gaGIAEOQ5DC0ca7FOggnieJxbCOI4liSMwzjK75sEsgQBngABrmcfCFnAAATBGCAAGgYZugA
-EoRr+AwCHyABiGUfswBUMQAEeRxHkeZJlGSOSCCCIAgEuHogCMNBAj+PLaHOTIAG+cwENwbbBh+Fp3zA
-ep0gAapkm+AANAmBQAAaB8VmcY52tYGbHlAT5Pl6WRZlnCCBhkGIYjeHYeiGSBIEfDB7m9DBvHoIAAHM
-ZxQgAHIchLCppGmAB8waAACnKXQAAyCdimwbFOmuBomgAXBcF2cZXliWAPIIyQHiALuNl+Q2PAAc5xnn
-DJzmoAAWAoZYAMwBOHFIXIAG0eoLgAFYGm8AAeByw50Gw+pEGNZp0Haeh9F+YJg2aga5gWEIuC6LxvBi
-GAXgAbJtG0AAJnyqw1DUKIAH6fb2n6ebZgCfZ0n+fZ3Piexwn4f5zG8e5/kIXpvFOXZsHYPiBy2gwBiW
-JQlHcr4CHedZ2HYdBFi4BQYhKEQUgGf4Cnsrbvn+fx4UIfh50z0CtnCb8JlOWpxGQUUZC6gZxqukWlTA
-5B/gmKAXgwShGjkGInHIeR7n2cZxnoeRzG2ep0G6dB7HEbRynmbpuHWexrnGfB8mygb2uRYqBdemQMBo
-DAHjUr4AgSZBzHiXCuTOi1MoFRH5IH+bWIH+LaIIgIAADwEAAAMAAAABABAAAAEBAAMAAAABABAAAAEC
-AAMAAAAEAAAEXgEDAAMAAAABAAUAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEV
-AAMAAAABAAQAAAEWAAMAAAABABAAAAEXAAQAAAABAAADnAEcAAMAAAABAAEAAAE9AAMAAAABAAIAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAEZodzAAcAAChsAAAEbgAAAAAACAAIAAgACAABAAEAAQABAAAobGFw
-cGwCAAAAbW50clJHQiBYWVogB9oAAQAFABUAAAAWYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAARclhZWgAAAVAAAAAUZ1hZWgAAAWQAAAAUYlhZWgAAAXgAAAAUd3RwdAAAAYwAAAAUY2hhZAAA
-AaAAAAAsclRSQwAAAcwAAAgMZ1RSQwAACdgAAAgMYlRSQwAAEeQAAAgMYWFyZwAAGfAAAAAgYWFnZwAA
-GhAAAAAgYWFiZwAAGjAAAAAgdmNndAAAGlAAAAYSbmRpbgAAIGQAAAY+ZGVzYwAAJqQAAABtZHNjbQAA
-JxQAAAEMbW1vZAAAKCAAAAAoY3BydAAAKEgAAAAkWFlaIAAAAAAAAHO8AAA7JAAAAd9YWVogAAAAAAAA
-XqoAALfXAAAUtVhZWiAAAAAAAAAkbwAADQUAALyZWFlaIAAAAAAAAPNSAAEAAAABFs9zZjMyAAAAAAAB
-DEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1cnYAAAAAAAAEAAAAAAUACgAPABQAGQAe
-ACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3AHwAgQCGAIsAkACVAJoAnwCkAKkArgCy
-ALcAvADBAMYAywDQANUA2gDgAOUA6gDwAPUA+wEBAQcBDAESARgBHgElASsBMQE4AT4BRQFLAVIBWQFg
-AWYBbQF1AXwBgwGKAZIBmQGhAagBsAG4AcAByAHQAdgB4AHpAfEB+gICAgsCFAIcAiUCLgI3AkACSgJT
-AlwCZgJwAnkCgwKNApcCoQKrArUCvwLKAtQC3wLqAvQC/wMKAxUDIAMrAzcDQgNNA1kDZQNwA3wDiAOU
-A6ADrAO5A8UD0gPeA+sD+AQEBBEEHgQsBDkERgRUBGEEbwR8BIoEmASmBLQEwgTRBN8E7gT8BQsFGgUo
-BTcFRwVWBWUFdAWEBZMFowWzBcMF0wXjBfMGAwYUBiQGNQZFBlYGZwZ4BokGmgarBr0GzgbgBvIHAwcV
-BycHOQdMB14HcAeDB5YHqAe7B84H4Qf0CAgIGwgvCEIIVghqCH4IkgimCLoIzgjjCPcJDAkhCTYJSwlg
-CXUJigmgCbUJywngCfYKDAoiCjkKTwplCnwKkgqpCsAK1wruCwULHQs0C0sLYwt7C5MLqwvDC9sL8wwM
-DCQMPQxWDG4MhwyhDLoM0wztDQYNIA06DVQNbg2IDaINvA3XDfEODA4nDkIOXQ54DpMOrw7KDuYPAg8e
-DzoPVg9yD44Pqw/ID+QQARAeEDsQWBB2EJMQsRDOEOwRChEoEUYRZBGDEaERwBHfEf4SHRI8ElsSehKa
-ErkS2RL5ExkTORNZE3oTmhO7E9sT/BQdFD4UXxSBFKIUxBTlFQcVKRVLFW0VkBWyFdUV9xYaFj0WYBaD
-FqcWyhbuFxIXNRdZF30XohfGF+oYDxg0GFkYfRijGMgY7RkTGTgZXhmEGaoZ0Bn2Gh0aQxpqGpAatxre
-GwYbLRtUG3wboxvLG/McGxxDHGwclBy9HOYdDh03HWAdih2zHd0eBh4wHloehB6uHtgfAx8tH1gfgx+u
-H9kgBCAwIFsghyCzIN4hCiE3IWMhjyG8IekiFSJCInAinSLKIvgjJSNTI4EjryPdJAwkOiRpJJckxiT1
-JSQlVCWDJbMl4iYSJkImciajJtMnAyc0J2UnlifHJ/goKihbKI0ovijwKSIpVSmHKbkp7CofKlIqhSq4
-KusrHitSK4YruivuLCIsViyKLL8s9C0pLV4tky3ILf0uMy5pLp4u1C8LL0Evdy+uL+QwGzBSMIkwwTD4
-MTAxZzGfMdcyDzJIMoAyuDLxMyozYzOcM9U0DzRINII0vDT2NTA1ajWlNd82GjZVNpA2yzcGN0I3fje5
-N/U4MThtOKo45jkjOWA5nTnaOhc6VDqSOs87DTtLO4k7xzwGPEQ8gzzCPQE9QD1/Pb89/j4+Pn4+vj7+
-Pz8/fz/AQABAQUCCQMRBBUFHQYhBykIMQk5CkULTQxZDWEObQ95EIURlRKhE7EUwRXRFuEX8RkBGhUbK
-Rw5HU0eZR95II0hpSK9I9Uk7SYFJx0oOSlVKm0riSypLcUu4TABMSEyQTNhNIE1oTbFN+k5CToxO1U8e
-T2dPsU/7UEVQj1DZUSRRblG5UgRST1KaUuVTMVN8U8hUFFRgVK1U+VVGVZJV31YsVnpWx1cUV2JXsFf+
-WExYmljpWThZhlnVWiRadFrDWxNbY1uyXANcU1yjXPRdRF2VXeZeN16JXtpfLF9+X9BgImB0YMdhGWFs
-Yb9iEmJlYrljDGNgY7RkCGRcZLFlBWVaZa9mBGZZZq9nBGdaZ7BoBmhcaLJpCWlfabZqDWpkarxrE2tr
-a8NsG2xzbMttI218bdVuLm6HbuBvOm+Tb+1wR3ChcPtxVnGwcgtyZnLBcxxzeHPTdC90i3TndUN1oHX8
-dll2tncTd3B3zngreIl453lFeaN6Anpger97Hnt9e9x8PHybfPt9W327fht+fH7cfz1/nn//gGCAwoEj
-gYWB54JJgquDDoNwg9OENoSZhPyFYIXDhieGi4bvh1SHuIgdiIGI5olMibGKFop8iuKLSIuujBSMe4zi
-jUiNr44Xjn6O5Y9Nj7WQHZCFkO6RVpG/kiiSkZL6k2STzZQ3lKGVC5V1leCWSpa1lyCXi5f3mGKYzpk6
-maaaEpp+muubV5vEnDGcn50MnXmd555VnsOfMZ+goA+gfaDsoVuhy6I6oqqjGqOKo/qkaqTbpUylvKYu
-pp+nEKeCp/SoZajYqUqpvKovqqKrFauIq/usb6zjrVaty64/rrOvKK+dsBGwh7D8sXGx57JdstOzSbO/
-tDa0rbUktZu2EraJtwG3ebfxuGm44blaudK6S7rEuz67t7wwvKq9JL2evhm+k78Ov4nABMB/wPrBdsHx
-wm3C6cNmw+LEX8TcxVnF1sZTxtHHTsfMyErIyclHycbKRcrEy0PLwsxCzMHNQc3BzkLOws9Dz8PQRNDG
-0UfRyNJK0szTTtPQ1FPU1tVY1dvWXtbi12XX6dht2PHZddn62n/bA9uI3A7ck90Z3Z7eJN6q3zHft+A+
-4MXhTOHT4lri4uNq4/LkeuUC5YvmE+ac5yXnr+g46MLpTOnW6mDq6ut16//siu0W7aHuLO6470Tv0PBc
-8OnxdfIC8o/zHPOq9Df0xfVT9eH2b/b+94z4G/iq+Tn5yfpZ+uj7ePwI/Jn9Kf26/kv+3P9uY3VydgAA
-AAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACB
-AIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8AMEAxgDLANAA1QDaAOAA5QDqAPAA9QD7AQEBBwEMARIBGAEe
-ASUBKwExATgBPgFFAUsBUgFZAWABZgFtAXUBfAGDAYoBkgGZAaEBqAGwAbgBwAHIAdAB2AHgAekB8QH6
-AgICCwIUAhwCJQIuAjcCQAJKAlMCXAJmAnACeQKDAo0ClwKhAqsCtQK/AsoC1ALfAuoC9AL/AwoDFQMg
-AysDNwNCA00DWQNlA3ADfAOIA5QDoAOsA7kDxQPSA94D6wP4BAQEEQQeBCwEOQRGBFQEYQRvBHwEigSY
-BKYEtATCBNEE3wTuBPwFCwUaBSgFNwVHBVYFZQV0BYQFkwWjBbMFwwXTBeMF8wYDBhQGJAY1BkUGVgZn
-BngGiQaaBqsGvQbOBuAG8gcDBxUHJwc5B0wHXgdwB4MHlgeoB7sHzgfhB/QICAgbCC8IQghWCGoIfgiS
-CKYIugjOCOMI9wkMCSEJNglLCWAJdQmKCaAJtQnLCeAJ9goMCiIKOQpPCmUKfAqSCqkKwArXCu4LBQsd
-CzQLSwtjC3sLkwurC8ML2wvzDAwMJAw9DFYMbgyHDKEMugzTDO0NBg0gDToNVA1uDYgNog28DdcN8Q4M
-DicOQg5dDngOkw6vDsoO5g8CDx4POg9WD3IPjg+rD8gP5BABEB4QOxBYEHYQkxCxEM4Q7BEKESgRRhFk
-EYMRoRHAEd8R/hIdEjwSWxJ6EpoSuRLZEvkTGRM5E1kTehOaE7sT2xP8FB0UPhRfFIEUohTEFOUVBxUp
-FUsVbRWQFbIV1RX3FhoWPRZgFoMWpxbKFu4XEhc1F1kXfReiF8YX6hgPGDQYWRh9GKMYyBjtGRMZOBle
-GYQZqhnQGfYaHRpDGmoakBq3Gt4bBhstG1QbfBujG8sb8xwbHEMcbByUHL0c5h0OHTcdYB2KHbMd3R4G
-HjAeWh6EHq4e2B8DHy0fWB+DH64f2SAEIDAgWyCHILMg3iEKITchYyGPIbwh6SIVIkIicCKdIsoi+CMl
-I1MjgSOvI90kDCQ6JGkklyTGJPUlJCVUJYMlsyXiJhImQiZyJqMm0ycDJzQnZSeWJ8cn+CgqKFsojSi+
-KPApIilVKYcpuSnsKh8qUiqFKrgq6yseK1Irhiu6K+4sIixWLIosvyz0LSktXi2TLcgt/S4zLmkuni7U
-LwsvQS93L64v5DAbMFIwiTDBMPgxMDFnMZ8x1zIPMkgygDK4MvEzKjNjM5wz1TQPNEg0gjS8NPY1MDVq
-NaU13zYaNlU2kDbLNwY3Qjd+N7k39TgxOG04qjjmOSM5YDmdOdo6FzpUOpI6zzsNO0s7iTvHPAY8RDyD
-PMI9AT1APX89vz3+Pj4+fj6+Pv4/Pz9/P8BAAEBBQIJAxEEFQUdBiEHKQgxCTkKRQtNDFkNYQ5tD3kQh
-RGVEqETsRTBFdEW4RfxGQEaFRspHDkdTR5lH3kgjSGlIr0j1STtJgUnHSg5KVUqbSuJLKktxS7hMAExI
-TJBM2E0gTWhNsU36TkJOjE7VTx5PZ0+xT/tQRVCPUNlRJFFuUblSBFJPUppS5VMxU3xTyFQUVGBUrVT5
-VUZVklXfVixWelbHVxRXYlewV/5YTFiaWOlZOFmGWdVaJFp0WsNbE1tjW7JcA1xTXKNc9F1EXZVd5l43
-Xole2l8sX35f0GAiYHRgx2EZYWxhv2ISYmViuWMMY2BjtGQIZFxksWUFZVplr2YEZllmr2cEZ1pnsGgG
-aFxosmkJaV9ptmoNamRqvGsTa2trw2wbbHNsy20jbXxt1W4ubodu4G86b5Nv7XBHcKFw+3FWcbByC3Jm
-csFzHHN4c9N0L3SLdOd1Q3Wgdfx2WXa2dxN3cHfOeCt4iXjneUV5o3oCemB6v3see3173Hw8fJt8+31b
-fbt+G358ftx/PX+ef/+AYIDCgSOBhYHngkmCq4MOg3CD04Q2hJmE/IVghcOGJ4aLhu+HVIe4iB2IgYjm
-iUyJsYoWinyK4otIi66MFIx7jOKNSI2vjheOfo7lj02PtZAdkIWQ7pFWkb+SKJKRkvqTZJPNlDeUoZUL
-lXWV4JZKlrWXIJeLl/eYYpjOmTqZppoSmn6a65tXm8ScMZyfnQydeZ3nnlWew58xn6CgD6B9oOyhW6HL
-ojqiqqMao4qj+qRqpNulTKW8pi6mn6cQp4Kn9KhlqNipSqm8qi+qoqsVq4ir+6xvrOOtVq3Lrj+us68o
-r52wEbCHsPyxcbHnsl2y07NJs7+0NrSttSS1m7YStom3Abd5t/G4abjhuVq50rpLusS7Pru3vDC8qr0k
-vZ6+Gb6Tvw6/icAEwH/A+sF2wfHCbcLpw2bD4sRfxNzFWcXWxlPG0cdOx8zISsjJyUfJxspFysTLQ8vC
-zELMwc1BzcHOQs7Cz0PPw9BE0MbRR9HI0krSzNNO09DUU9TW1VjV29Ze1uLXZdfp2G3Y8dl12fraf9sD
-24jcDtyT3Rndnt4k3qrfMd+34D7gxeFM4dPiWuLi42rj8uR65QLli+YT5pznJeev6DjowulM6dbqYOrq
-63Xr/+yK7Rbtoe4s7rjvRO/Q8Fzw6fF18gLyj/Mc86r0N/TF9VP14fZv9v73jPgb+Kr5OfnJ+ln66Pt4
-/Aj8mf0p/br+S/7c/25jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBP
-AFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANoA4ADl
-AOoA8AD1APsBAQEHAQwBEgEYAR4BJQErATEBOAE+AUUBSwFSAVkBYAFmAW0BdQF8AYMBigGSAZkBoQGo
-AbABuAHAAcgB0AHYAeAB6QHxAfoCAgILAhQCHAIlAi4CNwJAAkoCUwJcAmYCcAJ5AoMCjQKXAqECqwK1
-Ar8CygLUAt8C6gL0Av8DCgMVAyADKwM3A0IDTQNZA2UDcAN8A4gDlAOgA6wDuQPFA9ID3gPrA/gEBAQR
-BB4ELAQ5BEYEVARhBG8EfASKBJgEpgS0BMIE0QTfBO4E/AULBRoFKAU3BUcFVgVlBXQFhAWTBaMFswXD
-BdMF4wXzBgMGFAYkBjUGRQZWBmcGeAaJBpoGqwa9Bs4G4AbyBwMHFQcnBzkHTAdeB3AHgweWB6gHuwfO
-B+EH9AgICBsILwhCCFYIagh+CJIIpgi6CM4I4wj3CQwJIQk2CUsJYAl1CYoJoAm1CcsJ4An2CgwKIgo5
-Ck8KZQp8CpIKqQrACtcK7gsFCx0LNAtLC2MLewuTC6sLwwvbC/MMDAwkDD0MVgxuDIcMoQy6DNMM7Q0G
-DSANOg1UDW4NiA2iDbwN1w3xDgwOJw5CDl0OeA6TDq8Oyg7mDwIPHg86D1YPcg+OD6sPyA/kEAEQHhA7
-EFgQdhCTELEQzhDsEQoRKBFGEWQRgxGhEcAR3xH+Eh0SPBJbEnoSmhK5EtkS+RMZEzkTWRN6E5oTuxPb
-E/wUHRQ+FF8UgRSiFMQU5RUHFSkVSxVtFZAVshXVFfcWGhY9FmAWgxanFsoW7hcSFzUXWRd9F6IXxhfq
-GA8YNBhZGH0YoxjIGO0ZExk4GV4ZhBmqGdAZ9hodGkMaahqQGrca3hsGGy0bVBt8G6MbyxvzHBscQxxs
-HJQcvRzmHQ4dNx1gHYodsx3dHgYeMB5aHoQerh7YHwMfLR9YH4Mfrh/ZIAQgMCBbIIcgsyDeIQohNyFj
-IY8hvCHpIhUiQiJwIp0iyiL4IyUjUyOBI68j3SQMJDokaSSXJMYk9SUkJVQlgyWzJeImEiZCJnImoybT
-JwMnNCdlJ5Ynxyf4KCooWyiNKL4o8CkiKVUphym5KewqHypSKoUquCrrKx4rUiuGK7or7iwiLFYsiiy/
-LPQtKS1eLZMtyC39LjMuaS6eLtQvCy9BL3cvri/kMBswUjCJMMEw+DEwMWcxnzHXMg8ySDKAMrgy8TMq
-M2MznDPVNA80SDSCNLw09jUwNWo1pTXfNho2VTaQNss3BjdCN343uTf1ODE4bTiqOOY5IzlgOZ052joX
-OlQ6kjrPOw07SzuJO8c8BjxEPIM8wj0BPUA9fz2/Pf4+Pj5+Pr4+/j8/P38/wEAAQEFAgkDEQQVBR0GI
-QcpCDEJOQpFC00MWQ1hDm0PeRCFEZUSoROxFMEV0RbhF/EZARoVGykcOR1NHmUfeSCNIaUivSPVJO0mB
-ScdKDkpVSptK4ksqS3FLuEwATEhMkEzYTSBNaE2xTfpOQk6MTtVPHk9nT7FP+1BFUI9Q2VEkUW5RuVIE
-Uk9SmlLlUzFTfFPIVBRUYFStVPlVRlWSVd9WLFZ6VsdXFFdiV7BX/lhMWJpY6Vk4WYZZ1VokWnRaw1sT
-W2NbslwDXFNco1z0XURdlV3mXjdeiV7aXyxffl/QYCJgdGDHYRlhbGG/YhJiZWK5YwxjYGO0ZAhkXGSx
-ZQVlWmWvZgRmWWavZwRnWmewaAZoXGiyaQlpX2m2ag1qZGq8axNra2vDbBtsc2zLbSNtfG3Vbi5uh27g
-bzpvk2/tcEdwoXD7cVZxsHILcmZywXMcc3hz03QvdIt053VDdaB1/HZZdrZ3E3dwd854K3iJeOd5RXmj
-egJ6YHq/ex57fXvcfDx8m3z7fVt9u34bfnx+3H89f55//4BggMKBI4GFgeeCSYKrgw6DcIPThDaEmYT8
-hWCFw4YnhouG74dUh7iIHYiBiOaJTImxihaKfIrii0iLrowUjHuM4o1Ija+OF45+juWPTY+1kB2QhZDu
-kVaRv5IokpGS+pNkk82UN5ShlQuVdZXglkqWtZcgl4uX95himM6ZOpmmmhKafprrm1ebxJwxnJ+dDJ15
-neeeVZ7DnzGfoKAPoH2g7KFbocuiOqKqoxqjiqP6pGqk26VMpbymLqafpxCngqf0qGWo2KlKqbyqL6qi
-qxWriKv7rG+s461WrcuuP66zryivnbARsIew/LFxseeyXbLTs0mzv7Q2tK21JLWbthK2ibcBt3m38bhp
-uOG5WrnSuku6xLs+u7e8MLyqvSS9nr4ZvpO/Dr+JwATAf8D6wXbB8cJtwunDZsPixF/E3MVZxdbGU8bR
-x07HzMhKyMnJR8nGykXKxMtDy8LMQszBzUHNwc5CzsLPQ8/D0ETQxtFH0cjSStLM007T0NRT1NbVWNXb
-1l7W4tdl1+nYbdjx2XXZ+tp/2wPbiNwO3JPdGd2e3iTeqt8x37fgPuDF4Uzh0+Ja4uLjauPy5HrlAuWL
-5hPmnOcl56/oOOjC6Uzp1upg6urrdev/7IrtFu2h7izuuO9E79DwXPDp8XXyAvKP8xzzqvQ39MX1U/Xh
-9m/2/veM+Bv4qvk5+cn6Wfro+3j8CPyZ/Sn9uv5L/tz/bnBhcmEAAAAAAAMAAAACZmYAAPKnAAANWQAA
-E9AAAAsDcGFyYQAAAAAAAwAAAAJmZgAA8qcAAA1ZAAAT0AAACwNwYXJhAAAAAAADAAAAAmZmAADypwAA
-DVkAABPQAAALA3ZjZ3QAAAAAAAAAAAADAQAAAgAAAFYBIwGwAlkDFQPkBLEFjQZtB1EIPAklChgLEgwI
-DQQOBw8REBURHhIsEz4UThVnFnoXjRifGa4auRvGHNsd8R8OIC8hUiJxI4oknSWvJrsnxSjQKdgq3ivh
-LOUt6S7vL/Mw+zIEMww0FDUbNiI3JjgpOSw6LTstPCs9KT4nPyVAIUEfQhxDGUQURQ9GB0b/R/dI7Unj
-SthLzEzBTbVOqU+fUJhRlFKTU5JUkVWQVo5XiliHWYNaflt4XHJda15mX2NgZWFqYnFjfGSHZZBmmGeh
-aKlpr2q2a7tswG3Gbs5v2HDocfxzFHQudUd2YXd7eJR5q3rDe9p88H4FfxiAKIE1gkCDR4RNhVGGVYdX
-iFqJXIpdi16MXo1ejmCPZJBskXuSjpOmlL6V1pbtmASZGpowm0WcWp1unoOfmqCyoc2i66QJpSemRqdk
-qIGpn6q8q9is9K4PryewOrFJslOzWbRetWK2ZrdquG65cbp0u3a8eL16vn2/gcCJwZfCp8O8xNDF5cb5
-yA3JIcozy0bMWM1pznrPh9CR0ZbSl9OU1JDVitaE133Ydtlu2mbbXtxW3U3eRd884DXhL+Ir4yfkJOUg
-5h3nGegW6RLqD+sL7AftA+3+7vjv7fDZ8b3ymvNy9Ef1HfXz9sn3ofh4+U/6Jfr8+9L8qP1+/lT/Kv//
-AAAAKwDEAZUCWQMSA8gElAVzBlIHJwgJCPQJ2wrLC8QMuw22DrgPuBC7EcQSyxPbFOoV9hcEGBAZGRoe
-GyIcKh03Hk4faiCAIZciqSO2JMIlySbOJ88o0SnRKs8rzSzLLccuwy/BMMAxwDLBM8E0wTW/Nrw3uji2
-ObE6qzujPJo9kj6JP39AdEFrQmBDVERGRTlGK0cdSA1I/UnsStpLyEy1TaJOkE9+UHFRZVJbU1JUSlVC
-VjhXLlgkWRlaDlsCW/Vc6F3cXtFfyWDEYcNixmPJZM1l0mbWZ9lo3Gneat9r4GzhbeJu5W/qcPNyAXMS
-dCV1N3ZJd1x4bXl+eo57nnytfbt+yH/TgNuB4YLlg+eE6IXphuqH6ojpieiK5ovljOKN4Y7gj+OQ6ZH1
-kwSUFpUoljuXTJhemW+agJuQnKCdsZ7Cn9Wg6qIDox2kOaVWpnKnjaipqcOq3av3rQ+uJq87sE2xWrJl
-s2y0crV4tn23griHuYu6j7uTvJa9mr6fv6bAscHAwtLD6MT+xhTHKshAyVbKa8uAzJTNqM68z83Q29Hl
-0uzT8NT01ffW+tf92P/aAdsD3ATdBd4G3wfgCuEQ4hjjI+Qv5TvmRudR6FzpZ+px63vshe2P7pjvn/Cj
-8aLynfOV9Iz1gvZ392z4YflV+kr7Pvwy/SX+Gf8M//8AAAArAMQBcAIuAu0DlgRTBSAF7QbGB5gIbglP
-CjgLHwwEDPEN5Q7YD8kQxRG+ErwTvRS8Fb0WwxfJGNEZ4hr+HB8dSR52H6IgySHpIwMkGiUrJj0nSihV
-KV8qaCtwLHYtey6BL4cwjDGSMpkzoDSnNaw2sDe0OLc5uDq3O7Y8tD2wPq0/pkChQZpCkEOHRH5FckZn
-R1pITEk9Si9LHkwNTPxN607aT8tQvVGxUqhTn1SXVY1Wg1d5WG5ZYlpWW0hcOl0sXh9fE2AKYQViA2MC
-ZANlBWYGZwdoB2kGagVrBGwCbQBt/m79b/9xBnIPcxt0KXU4dkd3VHhheW56eXuFfI59mH6hf6aAqYGo
-gqWDoISahZSGjYeEiH2JdIpsi2OMWY1QjkiPQpA/kUGSSJNRlF2VaJZzl3+YiZmTmpybpZytnbaev5/J
-oNah56L5pA2lIKY0p0eoWqltqn+rkKyhrbGuwK/LsNOx2LLas9q02LXXttS30rjPuc26yrvHvMS9wr7B
-v8LAx8HQwt3D7cT9xg7HHsguyT3KTMtbzGnNd86Dz47QltGa0pzTm9SZ1ZbWlNeQ2I3ZidqF24Lcft17
-3njfeOB74YHii+OY5KbltObD59Do3unr6vjsBe0S7h/vLfA/8VXycfOR9LP11fb3+Bn5O/pc+338nv2+
-/t///wAAbmRpbgAAAAAAAAY2AACmFwAAVc8AAEu5AACesQAAJekAAA0hAABQDQAAVDkAAkAAAAIhRwAC
-FwoAAwEAAAIAAAABAAUACwASABsAJQAxAD4ATQBdAG4AgQCVAKoAwADYAPEBCwEmAUMBYAF/AaABwgHm
-AgwCNAJdAoYCsQLcAwgDNQNkA5UDyQP/BDcEcgSvBO0FLgVxBbcF/gZHBpEG3gcrB3oHywgeCHMIygkk
-CYAJ3go/CqILCAtwC9oMRgy1DSUNmA4NDoUO/w99D/0QfxEFEY0SGBKlEzUTxxRbFO8VhBYZFrAXSRfk
-GIIZIxnGGmwbFRvBHG8dIB3SHoUfNx/pIJshTSIBIrgjciQuJOwlriZxJzgoASjMKZgqZSswK/oswy2L
-LlUvIS/vML8xkTJmMz00FjTyNdE2szeYOII5cTpkO1w8WD1XPlk/X0BmQXFCf0OPRKNFuEbPR+VI+EoH
-SxRMH00sTjpPTFBfUXZSj1OqVMhV6VcMWDBZVVp6W55cwl3nXw5gNmFgYo1jvWTuZiJnWWiRac1rDWxT
-baBu9nBUcbhzH3SKdfd3Z3jZek97yH1DfsKAQ4HFg0eExYY+h7WJKoqhjBmNlY8TkJSSGJOflSmWtZhE
-mdibc50WnsSge6I6o/6lyKeVqWWrOa0RruuwybKqtI62dbhduka8Lb4Vv//B7MPcxc/Hxcm8y7fNtc+1
-0brTwtXQ1+vaHNxp3s/hRuPE5kPow+tG7c3wWfLp9X74GPq2/Vj//wAAAAIABQALABMAHAAmADMAQQBQ
-AGEAcwCGAJsAsQDIAOEA+wEWATMBUAFvAZABsgHWAfwCJAJOAnkCpQLRAv0DLANcA44DwwP6BDMEbwSt
-BO4FMAV1BbwGBQZQBp4G7Qc+B5AH5Ag6CJII7AlJCagKCQptCtMLPAuoDBYMhgz5DW8N5g5gDt0PXQ/f
-EGQQ6xF2EgMSlBMnE70UVhTxFY4WKxbJF2gYCRirGVAZ+BqjG1AcAByzHWkeIh7dH5ogWCEVIdIijiNL
-JAokyiWNJlMnGyfmKLQphCpXKywsAyzaLbEuhi9aMC4xBDHcMrYzkjRxNVI2NjccOAU48TngOtI7yTzE
-PcQ+xz/PQNlB5kL2RAhFHkY3R1JIcUmRSrRL1Uz1ThJPLFBGUWBSfVObVL1V4VcHWDBZXFqKW7lc6l4c
-X01gfWGtYt1kDmVBZndnr2jpaiZrZmyobe1vNnCCcdRzLHSMdfF3XXjMej57s30rfqaAI4GkgyeErYY1
-h76JRorKjEuNyY9GkMOSQ5PFlUmW0JhameebdZ0HnpugM6HQo3SlIKbUqI+qTqwQrdWvnbFosze1CLbd
-uLW6j7xsvknAJMH8w9LFqMeAyVvLOc0azv7Q5dLP1LvWq9id2pTckd6X4KviyuTy5x/pUOuF7b7v+fI5
-9Hz2wvkN+1r9q///AAAAAgAGAAwAFQAfACsAOABIAFkAawB/AJUArADEAN4A+gEWATUBVAF1AZgBvAHh
-AggCMAJYAoACqQLSAvwDJwNUA4MDtQPpBB8EWASSBM8FDgVPBZIF1wYeBmgGswcAB08HoAfyCEYInAj0
-CU8JqwoKCmsKzws2C54MCgx3DOgNWw3QDkkOxA9BD8IQRRDLEVQR4BJuEwATlBQrFMQVYBX8FpoXOBfY
-GHoZHxnHGnEbHhvOHIEdNx3wHqwfaSAnIOUhoyJgIx8j3yShJWYmLib4J8UolSlnKjwrFCvtLMctoC54
-L1AwKDEBMdwyuTOZNHw1YTZJNzM4ITkROgQ6/Dv5PPw+Az8PQB9BMkJIQ2JEfkWdRr9H5EkMSjZLYkyM
-TbVO2k/9USBSQ1NpVJFVu1bpWBlZTFqCW7tc9l4zX3FgrmHpYyRkYGWdZt1oHmljaqpr821Abo9v4XE2
-co9z7nVUdsF4NHmteyt8q34vf7aBQILMhFuF7YeBiReKroxEjdePZZDwknmUBJWQlx+YsZpGm96deJ8W
-oLaiWqQCpa+nZKkhquassK6AsFKyKLQCtd63vbmfu4S9a79TwT3DJMUHxubIwMqazHTOUdAw0hPT+NXg
-18vZuNup3ZvfjuF/42rlT+cu6Qrq5+zG7qfwivJw9Fj2Q/gx+iH8E/4I//8AAGRlc2MAAAAAAAAAE0xF
-RCBDaW5lbWEgRGlzcGxheQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAABIAAAAMbmxOTAAA
-ACQAAADoZGFESwAAACQAAADocGxQTAAAACQAAADoZW5VUwAAACQAAADobmJOTwAAACQAAADoZnJGUgAA
-ACQAAADocHRCUgAAACQAAADocHRQVAAAACQAAADoemhDTgAAACQAAADoZXNFUwAAACQAAADoamFKUAAA
-ACQAAADocnVSVQAAACQAAADoc3ZTRQAAACQAAADoemhUVwAAACQAAADoZGVERQAAACQAAADoZmlGSQAA
-ACQAAADoaXRJVAAAACQAAADoa29LUgAAACQAAADoAEwARQBEACAAQwBpAG4AZQBtAGEAIABEAGkAcwBw
-AGwAYQB5bW1vZAAAAAAAAAYQAACSNgJXAADFivKAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJp
-Z2h0IEFwcGxlLCBJbmMuLCAyMDEwAA</bytes>
+																							<bytes key="NS.bytes">TU0AKgAAA5yAACBQOCQWDQeDgGBiomCcKnlaNl1ouBtWBvyERmNRuChKBidRF8XLMvKFpFyBsaBvKOS2
+DgIBAEGAQCAUGPqcDceikJF1KE8TlBBr9ws1xP8NNtqtVrpB609mQSFAADP+BP0BgIBhMTiYSkQLBgMC
+wEAYDB6FAEPAsGAsNuNyOQKHcog8HDwPgYALFlvgALpxhEANvCI5oNFonWBv4HY0PFLINIDAUCg+sgMA
+AOsgAIhMKgAIBAHAABTYAPh5OQAGUeOcAP95OoANZtAIAOgOlkAKNQqFgrRbLYlQN7VMDF4ymZ7j8eEQ
+BBwOh/QA8GAAXCwTgB7spdgBzBPpNpgpQAEEYvYAP14O4AN5rvQAN0MGQALBYLF0KhUqkVwP2IGLgti4
+douC8L4JCOIwiIKe58H87xCEUAC5AWAARBibAAAeBZ9vSeJ2AAdhxHmABoHwIAAGAaZyn+SxLku/qBGu
+ggsCuK5qCiyAVitHgAHmeqrHSbhaAAYpnPYBRoleAAji8DYAHicRwgABQEAKAB9no+BiG6EIAHWBoYgA
+QxDEKLRyHKcpToIJ4niaWwjiOJgkjMM4yu0bBLNeAh4AAbBmr8AAAnAAATBICAAGiYRugAEoRgOqgCL8
+YhlQefAVDEABHkcR5HmSZRkjkgggh+H5Lh6IIjjQQI/jy150EyABvnKBDZm2e4ACAFx3ywep0tmZBvgA
+DQJgUAAGge+BnGOdoAHqGbFFATxPF6WRaFpBaBhkGAYDeHYfCISBIEfCR8m/CRuHnFB0GcUIAByHQSgA
+cRomm08EAAA5yl0AAMgnX5sGwfoAGoBomgAW5bsAWBZFiDyCMaBwgC9ihfzIQwAHOccSHKc5qOsCplqo
+AoEgAXJRlzPx6guAAWgabwAB4HLBHSbD4EIY0KnOdh5n0YBhGFYyBraBYQi4LovG8GIYBeABsm0bQAAo
+fKojWNYovSfb0H6eTXAEfZ0H+fZ3Wae5vn4f5zG8e5/kCXpvlOXRtHaPiBymgwBiUJIkncAoBgId51nY
+dp0EcLoEhiEoQhSAZ/gMeyrAByB/PW9J5HyAHLqscBvwcU5aHGZBQGsc4uoGcaDgUAPVn2f/XAmKIWgs
+ShHjmGInHIeZ8H2cRxHprptHodBtnSexxG0cp6G6bZ1Hsa5xnyfJsuIgdfoF1CXAwGoLgcNQCAGAIEmO
+cx4lwgdmoFzCBUC06B/Z9n1ABB6BoCAAAA8BAAADAAAAAQAQAAABAQADAAAAAQAQAAABAgADAAAABAAA
+BFYBAwADAAAAAQAFAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE
+AAABFgADAAAAAQAQAAABFwAEAAAAAQAAA5MBHAADAAAAAQABAAABPQADAAAAAQACAAABUgADAAAAAQAB
+AAABUwADAAAABAAABF6HcwAHAAAdXAAABGYAAAAAAAgACAAIAAgAAQABAAEAAQAAHVxhcHBsAgAAAG1u
+dHJSR0IgWFlaIAfaAAEAAQAKABIAE2Fjc3BBUFBMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD21gAB
+AAAAANMtYXBwbNcFlTo7ZhvF4zTVy03Hh8EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEXJY
+WVoAAAFQAAAAFGdYWVoAAAFkAAAAFGJYWVoAAAF4AAAAFHd0cHQAAAGMAAAAFGNoYWQAAAGgAAAALHJU
+UkMAAAHMAAAIDGdUUkMAAAnYAAAIDGJUUkMAABHkAAAIDGFhcmcAABnwAAAAIGFhZ2cAABoQAAAAIGFh
+YmcAABowAAAAIHZjZ3QAABpQAAAAMG5kaW4AABqAAAAAOGRlc2MAABq4AAAAYmRzY20AABscAAAB9G1t
+b2QAAB0QAAAAKGNwcnQAAB04AAAAJFhZWiAAAAAAAABtnQAAOYsAAAJiWFlaIAAAAAAAAGNIAAC2kgAA
+E+FYWVogAAAAAAAAJfAAAA/iAAC86VhZWiAAAAAAAADz2AABAAAAARYIc2YzMgAAAAAAAQu3AAAFlv//
+81cAAAcpAAD91///+7f///2mAAAD2gAAwPZjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAy
+ADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDG
+AMsA0ADVANoA4ADlAOoA8AD1APsBAQEHAQwBEgEYAR4BJQErATEBOAE+AUUBSwFSAVkBYAFmAW0BdQF8
+AYMBigGSAZkBoQGoAbABuAHAAcgB0AHYAeAB6QHxAfoCAgILAhQCHAIlAi4CNwJAAkoCUwJcAmYCcAJ5
+AoMCjQKXAqECqwK1Ar8CygLUAt8C6gL0Av8DCgMVAyADKwM3A0IDTQNZA2UDcAN8A4gDlAOgA6wDuQPF
+A9ID3gPrA/gEBAQRBB4ELAQ5BEYEVARhBG8EfASKBJgEpgS0BMIE0QTfBO4E/AULBRoFKAU3BUcFVgVl
+BXQFhAWTBaMFswXDBdMF4wXzBgMGFAYkBjUGRQZWBmcGeAaJBpoGqwa9Bs4G4AbyBwMHFQcnBzkHTAde
+B3AHgweWB6gHuwfOB+EH9AgICBsILwhCCFYIagh+CJIIpgi6CM4I4wj3CQwJIQk2CUsJYAl1CYoJoAm1
+CcsJ4An2CgwKIgo5Ck8KZQp8CpIKqQrACtcK7gsFCx0LNAtLC2MLewuTC6sLwwvbC/MMDAwkDD0MVgxu
+DIcMoQy6DNMM7Q0GDSANOg1UDW4NiA2iDbwN1w3xDgwOJw5CDl0OeA6TDq8Oyg7mDwIPHg86D1YPcg+O
+D6sPyA/kEAEQHhA7EFgQdhCTELEQzhDsEQoRKBFGEWQRgxGhEcAR3xH+Eh0SPBJbEnoSmhK5EtkS+RMZ
+EzkTWRN6E5oTuxPbE/wUHRQ+FF8UgRSiFMQU5RUHFSkVSxVtFZAVshXVFfcWGhY9FmAWgxanFsoW7hcS
+FzUXWRd9F6IXxhfqGA8YNBhZGH0YoxjIGO0ZExk4GV4ZhBmqGdAZ9hodGkMaahqQGrca3hsGGy0bVBt8
+G6MbyxvzHBscQxxsHJQcvRzmHQ4dNx1gHYodsx3dHgYeMB5aHoQerh7YHwMfLR9YH4Mfrh/ZIAQgMCBb
+IIcgsyDeIQohNyFjIY8hvCHpIhUiQiJwIp0iyiL4IyUjUyOBI68j3SQMJDokaSSXJMYk9SUkJVQlgyWz
+JeImEiZCJnImoybTJwMnNCdlJ5Ynxyf4KCooWyiNKL4o8CkiKVUphym5KewqHypSKoUquCrrKx4rUiuG
+K7or7iwiLFYsiiy/LPQtKS1eLZMtyC39LjMuaS6eLtQvCy9BL3cvri/kMBswUjCJMMEw+DEwMWcxnzHX
+Mg8ySDKAMrgy8TMqM2MznDPVNA80SDSCNLw09jUwNWo1pTXfNho2VTaQNss3BjdCN343uTf1ODE4bTiq
+OOY5IzlgOZ052joXOlQ6kjrPOw07SzuJO8c8BjxEPIM8wj0BPUA9fz2/Pf4+Pj5+Pr4+/j8/P38/wEAA
+QEFAgkDEQQVBR0GIQcpCDEJOQpFC00MWQ1hDm0PeRCFEZUSoROxFMEV0RbhF/EZARoVGykcOR1NHmUfe
+SCNIaUivSPVJO0mBScdKDkpVSptK4ksqS3FLuEwATEhMkEzYTSBNaE2xTfpOQk6MTtVPHk9nT7FP+1BF
+UI9Q2VEkUW5RuVIEUk9SmlLlUzFTfFPIVBRUYFStVPlVRlWSVd9WLFZ6VsdXFFdiV7BX/lhMWJpY6Vk4
+WYZZ1VokWnRaw1sTW2NbslwDXFNco1z0XURdlV3mXjdeiV7aXyxffl/QYCJgdGDHYRlhbGG/YhJiZWK5
+YwxjYGO0ZAhkXGSxZQVlWmWvZgRmWWavZwRnWmewaAZoXGiyaQlpX2m2ag1qZGq8axNra2vDbBtsc2zL
+bSNtfG3Vbi5uh27gbzpvk2/tcEdwoXD7cVZxsHILcmZywXMcc3hz03QvdIt053VDdaB1/HZZdrZ3E3dw
+d854K3iJeOd5RXmjegJ6YHq/ex57fXvcfDx8m3z7fVt9u34bfnx+3H89f55//4BggMKBI4GFgeeCSYKr
+gw6DcIPThDaEmYT8hWCFw4YnhouG74dUh7iIHYiBiOaJTImxihaKfIrii0iLrowUjHuM4o1Ija+OF45+
+juWPTY+1kB2QhZDukVaRv5IokpGS+pNkk82UN5ShlQuVdZXglkqWtZcgl4uX95himM6ZOpmmmhKafprr
+m1ebxJwxnJ+dDJ15neeeVZ7DnzGfoKAPoH2g7KFbocuiOqKqoxqjiqP6pGqk26VMpbymLqafpxCngqf0
+qGWo2KlKqbyqL6qiqxWriKv7rG+s461WrcuuP66zryivnbARsIew/LFxseeyXbLTs0mzv7Q2tK21JLWb
+thK2ibcBt3m38bhpuOG5WrnSuku6xLs+u7e8MLyqvSS9nr4ZvpO/Dr+JwATAf8D6wXbB8cJtwunDZsPi
+xF/E3MVZxdbGU8bRx07HzMhKyMnJR8nGykXKxMtDy8LMQszBzUHNwc5CzsLPQ8/D0ETQxtFH0cjSStLM
+007T0NRT1NbVWNXb1l7W4tdl1+nYbdjx2XXZ+tp/2wPbiNwO3JPdGd2e3iTeqt8x37fgPuDF4Uzh0+Ja
+4uLjauPy5HrlAuWL5hPmnOcl56/oOOjC6Uzp1upg6urrdev/7IrtFu2h7izuuO9E79DwXPDp8XXyAvKP
+8xzzqvQ39MX1U/Xh9m/2/veM+Bv4qvk5+cn6Wfro+3j8CPyZ/Sn9uv5L/tz/bmN1cnYAAAAAAAAEAAAA
+AAUACgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3AHwAgQCGAIsAkACV
+AJoAnwCkAKkArgCyALcAvADBAMYAywDQANUA2gDgAOUA6gDwAPUA+wEBAQcBDAESARgBHgElASsBMQE4
+AT4BRQFLAVIBWQFgAWYBbQF1AXwBgwGKAZIBmQGhAagBsAG4AcAByAHQAdgB4AHpAfEB+gICAgsCFAIc
+AiUCLgI3AkACSgJTAlwCZgJwAnkCgwKNApcCoQKrArUCvwLKAtQC3wLqAvQC/wMKAxUDIAMrAzcDQgNN
+A1kDZQNwA3wDiAOUA6ADrAO5A8UD0gPeA+sD+AQEBBEEHgQsBDkERgRUBGEEbwR8BIoEmASmBLQEwgTR
+BN8E7gT8BQsFGgUoBTcFRwVWBWUFdAWEBZMFowWzBcMF0wXjBfMGAwYUBiQGNQZFBlYGZwZ4BokGmgar
+Br0GzgbgBvIHAwcVBycHOQdMB14HcAeDB5YHqAe7B84H4Qf0CAgIGwgvCEIIVghqCH4IkgimCLoIzgjj
+CPcJDAkhCTYJSwlgCXUJigmgCbUJywngCfYKDAoiCjkKTwplCnwKkgqpCsAK1wruCwULHQs0C0sLYwt7
+C5MLqwvDC9sL8wwMDCQMPQxWDG4MhwyhDLoM0wztDQYNIA06DVQNbg2IDaINvA3XDfEODA4nDkIOXQ54
+DpMOrw7KDuYPAg8eDzoPVg9yD44Pqw/ID+QQARAeEDsQWBB2EJMQsRDOEOwRChEoEUYRZBGDEaERwBHf
+Ef4SHRI8ElsSehKaErkS2RL5ExkTORNZE3oTmhO7E9sT/BQdFD4UXxSBFKIUxBTlFQcVKRVLFW0VkBWy
+FdUV9xYaFj0WYBaDFqcWyhbuFxIXNRdZF30XohfGF+oYDxg0GFkYfRijGMgY7RkTGTgZXhmEGaoZ0Bn2
+Gh0aQxpqGpAatxreGwYbLRtUG3wboxvLG/McGxxDHGwclBy9HOYdDh03HWAdih2zHd0eBh4wHloehB6u
+HtgfAx8tH1gfgx+uH9kgBCAwIFsghyCzIN4hCiE3IWMhjyG8IekiFSJCInAinSLKIvgjJSNTI4EjryPd
+JAwkOiRpJJckxiT1JSQlVCWDJbMl4iYSJkImciajJtMnAyc0J2UnlifHJ/goKihbKI0ovijwKSIpVSmH
+Kbkp7CofKlIqhSq4KusrHitSK4YruivuLCIsViyKLL8s9C0pLV4tky3ILf0uMy5pLp4u1C8LL0Evdy+u
+L+QwGzBSMIkwwTD4MTAxZzGfMdcyDzJIMoAyuDLxMyozYzOcM9U0DzRINII0vDT2NTA1ajWlNd82GjZV
+NpA2yzcGN0I3fje5N/U4MThtOKo45jkjOWA5nTnaOhc6VDqSOs87DTtLO4k7xzwGPEQ8gzzCPQE9QD1/
+Pb89/j4+Pn4+vj7+Pz8/fz/AQABAQUCCQMRBBUFHQYhBykIMQk5CkULTQxZDWEObQ95EIURlRKhE7EUw
+RXRFuEX8RkBGhUbKRw5HU0eZR95II0hpSK9I9Uk7SYFJx0oOSlVKm0riSypLcUu4TABMSEyQTNhNIE1o
+TbFN+k5CToxO1U8eT2dPsU/7UEVQj1DZUSRRblG5UgRST1KaUuVTMVN8U8hUFFRgVK1U+VVGVZJV31Ys
+VnpWx1cUV2JXsFf+WExYmljpWThZhlnVWiRadFrDWxNbY1uyXANcU1yjXPRdRF2VXeZeN16JXtpfLF9+
+X9BgImB0YMdhGWFsYb9iEmJlYrljDGNgY7RkCGRcZLFlBWVaZa9mBGZZZq9nBGdaZ7BoBmhcaLJpCWlf
+abZqDWpkarxrE2tra8NsG2xzbMttI218bdVuLm6HbuBvOm+Tb+1wR3ChcPtxVnGwcgtyZnLBcxxzeHPT
+dC90i3TndUN1oHX8dll2tncTd3B3zngreIl453lFeaN6Anpger97Hnt9e9x8PHybfPt9W327fht+fH7c
+fz1/nn//gGCAwoEjgYWB54JJgquDDoNwg9OENoSZhPyFYIXDhieGi4bvh1SHuIgdiIGI5olMibGKFop8
+iuKLSIuujBSMe4zijUiNr44Xjn6O5Y9Nj7WQHZCFkO6RVpG/kiiSkZL6k2STzZQ3lKGVC5V1leCWSpa1
+lyCXi5f3mGKYzpk6maaaEpp+muubV5vEnDGcn50MnXmd555VnsOfMZ+goA+gfaDsoVuhy6I6oqqjGqOK
+o/qkaqTbpUylvKYupp+nEKeCp/SoZajYqUqpvKovqqKrFauIq/usb6zjrVaty64/rrOvKK+dsBGwh7D8
+sXGx57JdstOzSbO/tDa0rbUktZu2EraJtwG3ebfxuGm44blaudK6S7rEuz67t7wwvKq9JL2evhm+k78O
+v4nABMB/wPrBdsHxwm3C6cNmw+LEX8TcxVnF1sZTxtHHTsfMyErIyclHycbKRcrEy0PLwsxCzMHNQc3B
+zkLOws9Dz8PQRNDG0UfRyNJK0szTTtPQ1FPU1tVY1dvWXtbi12XX6dht2PHZddn62n/bA9uI3A7ck90Z
+3Z7eJN6q3zHft+A+4MXhTOHT4lri4uNq4/LkeuUC5YvmE+ac5yXnr+g46MLpTOnW6mDq6ut16//siu0W
+7aHuLO6470Tv0PBc8OnxdfIC8o/zHPOq9Df0xfVT9eH2b/b+94z4G/iq+Tn5yfpZ+uj7ePwI/Jn9Kf26
+/kv+3P9uY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoATwBUAFkAXgBj
+AGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8AMEAxgDLANAA1QDaAOAA5QDqAPAA9QD7
+AQEBBwEMARIBGAEeASUBKwExATgBPgFFAUsBUgFZAWABZgFtAXUBfAGDAYoBkgGZAaEBqAGwAbgBwAHI
+AdAB2AHgAekB8QH6AgICCwIUAhwCJQIuAjcCQAJKAlMCXAJmAnACeQKDAo0ClwKhAqsCtQK/AsoC1ALf
+AuoC9AL/AwoDFQMgAysDNwNCA00DWQNlA3ADfAOIA5QDoAOsA7kDxQPSA94D6wP4BAQEEQQeBCwEOQRG
+BFQEYQRvBHwEigSYBKYEtATCBNEE3wTuBPwFCwUaBSgFNwVHBVYFZQV0BYQFkwWjBbMFwwXTBeMF8wYD
+BhQGJAY1BkUGVgZnBngGiQaaBqsGvQbOBuAG8gcDBxUHJwc5B0wHXgdwB4MHlgeoB7sHzgfhB/QICAgb
+CC8IQghWCGoIfgiSCKYIugjOCOMI9wkMCSEJNglLCWAJdQmKCaAJtQnLCeAJ9goMCiIKOQpPCmUKfAqS
+CqkKwArXCu4LBQsdCzQLSwtjC3sLkwurC8ML2wvzDAwMJAw9DFYMbgyHDKEMugzTDO0NBg0gDToNVA1u
+DYgNog28DdcN8Q4MDicOQg5dDngOkw6vDsoO5g8CDx4POg9WD3IPjg+rD8gP5BABEB4QOxBYEHYQkxCx
+EM4Q7BEKESgRRhFkEYMRoRHAEd8R/hIdEjwSWxJ6EpoSuRLZEvkTGRM5E1kTehOaE7sT2xP8FB0UPhRf
+FIEUohTEFOUVBxUpFUsVbRWQFbIV1RX3FhoWPRZgFoMWpxbKFu4XEhc1F1kXfReiF8YX6hgPGDQYWRh9
+GKMYyBjtGRMZOBleGYQZqhnQGfYaHRpDGmoakBq3Gt4bBhstG1QbfBujG8sb8xwbHEMcbByUHL0c5h0O
+HTcdYB2KHbMd3R4GHjAeWh6EHq4e2B8DHy0fWB+DH64f2SAEIDAgWyCHILMg3iEKITchYyGPIbwh6SIV
+IkIicCKdIsoi+CMlI1MjgSOvI90kDCQ6JGkklyTGJPUlJCVUJYMlsyXiJhImQiZyJqMm0ycDJzQnZSeW
+J8cn+CgqKFsojSi+KPApIilVKYcpuSnsKh8qUiqFKrgq6yseK1Irhiu6K+4sIixWLIosvyz0LSktXi2T
+Lcgt/S4zLmkuni7ULwsvQS93L64v5DAbMFIwiTDBMPgxMDFnMZ8x1zIPMkgygDK4MvEzKjNjM5wz1TQP
+NEg0gjS8NPY1MDVqNaU13zYaNlU2kDbLNwY3Qjd+N7k39TgxOG04qjjmOSM5YDmdOdo6FzpUOpI6zzsN
+O0s7iTvHPAY8RDyDPMI9AT1APX89vz3+Pj4+fj6+Pv4/Pz9/P8BAAEBBQIJAxEEFQUdBiEHKQgxCTkKR
+QtNDFkNYQ5tD3kQhRGVEqETsRTBFdEW4RfxGQEaFRspHDkdTR5lH3kgjSGlIr0j1STtJgUnHSg5KVUqb
+SuJLKktxS7hMAExITJBM2E0gTWhNsU36TkJOjE7VTx5PZ0+xT/tQRVCPUNlRJFFuUblSBFJPUppS5VMx
+U3xTyFQUVGBUrVT5VUZVklXfVixWelbHVxRXYlewV/5YTFiaWOlZOFmGWdVaJFp0WsNbE1tjW7JcA1xT
+XKNc9F1EXZVd5l43Xole2l8sX35f0GAiYHRgx2EZYWxhv2ISYmViuWMMY2BjtGQIZFxksWUFZVplr2YE
+Zllmr2cEZ1pnsGgGaFxosmkJaV9ptmoNamRqvGsTa2trw2wbbHNsy20jbXxt1W4ubodu4G86b5Nv7XBH
+cKFw+3FWcbByC3JmcsFzHHN4c9N0L3SLdOd1Q3Wgdfx2WXa2dxN3cHfOeCt4iXjneUV5o3oCemB6v3se
+e3173Hw8fJt8+31bfbt+G358ftx/PX+ef/+AYIDCgSOBhYHngkmCq4MOg3CD04Q2hJmE/IVghcOGJ4aL
+hu+HVIe4iB2IgYjmiUyJsYoWinyK4otIi66MFIx7jOKNSI2vjheOfo7lj02PtZAdkIWQ7pFWkb+SKJKR
+kvqTZJPNlDeUoZULlXWV4JZKlrWXIJeLl/eYYpjOmTqZppoSmn6a65tXm8ScMZyfnQydeZ3nnlWew58x
+n6CgD6B9oOyhW6HLojqiqqMao4qj+qRqpNulTKW8pi6mn6cQp4Kn9KhlqNipSqm8qi+qoqsVq4ir+6xv
+rOOtVq3Lrj+us68or52wEbCHsPyxcbHnsl2y07NJs7+0NrSttSS1m7YStom3Abd5t/G4abjhuVq50rpL
+usS7Pru3vDC8qr0kvZ6+Gb6Tvw6/icAEwH/A+sF2wfHCbcLpw2bD4sRfxNzFWcXWxlPG0cdOx8zISsjJ
+yUfJxspFysTLQ8vCzELMwc1BzcHOQs7Cz0PPw9BE0MbRR9HI0krSzNNO09DUU9TW1VjV29Ze1uLXZdfp
+2G3Y8dl12fraf9sD24jcDtyT3Rndnt4k3qrfMd+34D7gxeFM4dPiWuLi42rj8uR65QLli+YT5pznJeev
+6DjowulM6dbqYOrq63Xr/+yK7Rbtoe4s7rjvRO/Q8Fzw6fF18gLyj/Mc86r0N/TF9VP14fZv9v73jPgb
++Kr5OfnJ+ln66Pt4/Aj8mf0p/br+S/7c/25wYXJhAAAAAAADAAAAAmZmAADypwAADVkAABPQAAALA3Bh
+cmEAAAAAAAMAAAACZmYAAPKnAAANWQAAE9AAAAsDcGFyYQAAAAAAAwAAAAJmZgAA8qcAAA1ZAAAT0AAA
+CwN2Y2d0AAAAAAAAAAEAAQAAAAAAAAABAAAAAQAAAAAAAAABAAAAAQAAAAAAAAABAABuZGluAAAAAAAA
+ADAAAKPAAABXAAAAT0AAAJxAAAAmgAAAD0AAAFBAAABUQAACMzMAAjMzAAIzM2Rlc2MAAAAAAAAACERp
+c3BsYXkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAABIAAAAMbmxOTAAAACgAAADoZGFESwAA
+AAoAAAEQcGxQTAAAAA4AAAEaZW5VUwAAAA4AAAEobmJOTwAAAAwAAAE2ZnJGUgAAADAAAAFCcHRCUgAA
+ACgAAAFycHRQVAAAAA4AAAEaemhDTgAAAAYAAAGaZXNFUwAAABAAAAGgamFKUAAAAAwAAAGwcnVSVQAA
+AA4AAAG8c3ZTRQAAABIAAAHKemhUVwAAAAYAAAHcZGVERQAAAA4AAAEaZmlGSQAAAAwAAAHiaXRJVAAA
+AA4AAAEaa29LUgAAAAYAAAHuAE8AbgBiAGUAawBlAG4AZAAgAGIAZQBlAGwAZABzAGMAaABlAHIAbQBT
+AGsA5gByAG0ATQBvAG4AaQB0AG8AcgBEAGkAcwBwAGwAYQB5AFMAawBqAGUAcgBtAE0AbwBuAGkAdABl
+AHUAcgAgAGQAZQAgAHQAeQBwAGUAIABpAG4AYwBvAG4AbgB1AE0AbwBuAGkAdABvAHIAIABEAGUAcwBj
+AG8AbgBoAGUAYwBpAGQAb2Y+eTpWaABQAGEAbgB0AGEAbABsAGEwxzCjMLkw1zDsMKQEHAQ+BD0EOARC
+BD4EQABCAGkAbABkAHMAawDkAHIAbZhveTpWaABOAOQAeQB0AHQA9rqossjRMG1tb2QAAAAAAAAGEAAA
+nMIAAAAAxYGrbAAAAAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAx
+MAA</bytes>
 																						</object>
 																						<string key="NSCacheWindowColorSpace">NSCalibratedRGBColorSpace</string>
 																						<int key="NSCacheWindowBPS">8</int>
 													</object>
 													<string key="NSFrame">{{0, 17}, {785, 148}}</string>
 													<reference key="NSSuperview" ref="214279069"/>
+													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="392325734"/>
 													<reference key="NSDocView" ref="392325734"/>
 													<reference key="NSBGColor" ref="131218211"/>
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{785, 17}, {15, 148}}</string>
 													<reference key="NSSuperview" ref="214279069"/>
+													<reference key="NSWindow"/>
 													<reference key="NSTarget" ref="214279069"/>
 													<string key="NSAction">_doScroller:</string>
 													<double key="NSCurValue">37</double>
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{-100, -100}, {180, 15}}</string>
 													<reference key="NSSuperview" ref="214279069"/>
+													<reference key="NSWindow"/>
 													<int key="NSsFlags">1</int>
 													<reference key="NSTarget" ref="214279069"/>
 													<string key="NSAction">_doScroller:</string>
 													</object>
 													<string key="NSFrameSize">{785, 17}</string>
 													<reference key="NSSuperview" ref="214279069"/>
+													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="288602249"/>
 													<reference key="NSDocView" ref="288602249"/>
 													<reference key="NSBGColor" ref="131218211"/>
 											</object>
 											<string key="NSFrameSize">{800, 165}</string>
 											<reference key="NSSuperview" ref="196042844"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="61754055"/>
 											<int key="NSsFlags">16</int>
 											<reference key="NSVScroller" ref="746151416"/>
 									</object>
 									<string key="NSFrameSize">{800, 164}</string>
 									<reference key="NSSuperview" ref="537766158"/>
+									<reference key="NSWindow"/>
 									<string key="NSClassName">NSView</string>
 								</object>
 								<object class="BWCustomView" id="532081020">
 																			<int key="NSvFlags">4352</int>
 																			<string key="NSFrameSize">{256, 292}</string>
 																			<reference key="NSSuperview" ref="305294895"/>
+																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<object class="_NSCornerView" key="NSCornerView">
 																				<nil key="NSNextResponder"/>
 																	</object>
 																	<string key="NSFrameSize">{256, 292}</string>
 																	<reference key="NSSuperview" ref="977457134"/>
+																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="408726427"/>
 																	<reference key="NSDocView" ref="408726427"/>
 																	<object class="NSColor" key="NSBGColor">
 																	<int key="NSvFlags">-2147483392</int>
 																	<string key="NSFrame">{{241, 17}, {15, 2}}</string>
 																	<reference key="NSSuperview" ref="977457134"/>
+																	<reference key="NSWindow"/>
 																	<reference key="NSTarget" ref="977457134"/>
 																	<string key="NSAction">_doScroller:</string>
 																	<double key="NSPercent">0.99658703804016113</double>
 																	<int key="NSvFlags">-2147483392</int>
 																	<string key="NSFrame">{{0, 264}, {277, 15}}</string>
 																	<reference key="NSSuperview" ref="977457134"/>
+																	<reference key="NSWindow"/>
 																	<int key="NSsFlags">1</int>
 																	<reference key="NSTarget" ref="977457134"/>
 																	<string key="NSAction">_doScroller:</string>
 															</object>
 															<string key="NSFrame">{{0, 23}, {256, 292}}</string>
 															<reference key="NSSuperview" ref="391521278"/>
+															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="305294895"/>
 															<int key="NSsFlags">560</int>
 															<reference key="NSVScroller" ref="864508780"/>
 																	<int key="NSvFlags">292</int>
 																	<string key="NSFrame">{{-1, -1}, {32, 24}}</string>
 																	<reference key="NSSuperview" ref="480384811"/>
+																	<reference key="NSWindow"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="BWAnchoredPopUpButtonCell" key="NSCell" id="756103436">
 																		<int key="NSCellFlags">-2076049856</int>
 																					<string key="NSAction">_popUpItemAction:</string>
 																					<reference key="NSTarget" ref="756103436"/>
 																				</object>
+																				<object class="NSMenuItem" id="476385405">
+																					<reference key="NSMenu" ref="386084604"/>
+																					<string key="NSTitle">Resolve</string>
+																					<string key="NSKeyEquiv"/>
+																					<int key="NSMnemonicLoc">2147483647</int>
+																					<reference key="NSOnImage" ref="705507820"/>
+																					<reference key="NSMixedImage" ref="516194051"/>
+																					<string key="NSAction">_popUpItemAction:</string>
+																					<reference key="NSTarget" ref="756103436"/>
+																				</object>
+																				<object class="NSMenuItem" id="127301567">
+																					<reference key="NSMenu" ref="386084604"/>
+																					<bool key="NSIsDisabled">YES</bool>
+																					<bool key="NSIsSeparator">YES</bool>
+																					<string key="NSTitle"/>
+																					<string key="NSKeyEquiv"/>
+																					<int key="NSMnemonicLoc">2147483647</int>
+																					<reference key="NSOnImage" ref="705507820"/>
+																					<reference key="NSMixedImage" ref="516194051"/>
+																					<string key="NSAction">_popUpItemAction:</string>
+																					<reference key="NSTarget" ref="756103436"/>
+																				</object>
 																				<object class="NSMenuItem" id="356574471">
 																					<reference key="NSMenu" ref="386084604"/>
 																					<string key="NSTitle">Commit Changes</string>
 																				</object>
 																			</object>
 																		</object>
+																		<int key="NSSelectedIndex">10</int>
 																		<bool key="NSPullDown">YES</bool>
 																		<int key="NSPreferredEdge">1</int>
 																		<bool key="NSUsesItemFromMenu">YES</bool>
 																	<int key="NSvFlags">290</int>
 																	<string key="NSFrame">{{30, -1}, {206, 24}}</string>
 																	<reference key="NSSuperview" ref="480384811"/>
+																	<reference key="NSWindow"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="BWAnchoredButtonCell" key="NSCell" id="997246285">
 																		<int key="NSCellFlags">67239424</int>
 															</object>
 															<string key="NSFrameSize">{256, 23}</string>
 															<reference key="NSSuperview" ref="391521278"/>
+															<reference key="NSWindow"/>
 															<bool key="BWABBIsResizable">YES</bool>
 															<bool key="BWABBIsAtBottom">YES</bool>
 															<bool key="BWABBHandleIsRightAligned">NO</bool>
 													</object>
 													<string key="NSFrameSize">{256, 315}</string>
 													<reference key="NSSuperview" ref="928128656"/>
+													<reference key="NSWindow"/>
 													<string key="NSClassName">NSView</string>
 												</object>
 												<object class="BWCustomView" id="168465909">
 																	<int key="NSvFlags">293</int>
 																	<string key="NSFrame">{{170, 3}, {205, 19}}</string>
 																	<reference key="NSSuperview" ref="1041810590"/>
+																	<reference key="NSWindow"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSSegmentedCell" key="NSCell" id="901185224">
 																		<int key="NSCellFlags">67239424</int>
 															</object>
 															<string key="NSFrame">{{0, 290}, {543, 25}}</string>
 															<reference key="NSSuperview" ref="168465909"/>
+															<reference key="NSWindow"/>
 															<object class="NSColor" key="BWGBFillStartingColor">
 																<int key="NSColorSpace">2</int>
 																<bytes key="NSRGB">MC45MzcyNTQ5NjUzIDAuOTM3MjU0OTY1MyAwLjkzNzI1NDk2NTMAA</bytes>
 																		<object class="NSTextView" id="1057217485">
 																			<reference key="NSNextResponder" ref="378280175"/>
 																			<int key="NSvFlags">2322</int>
-																			<string key="NSFrameSize">{0, 0}</string>
+																			<string key="NSFrame">{{0, -14}, {0.001, 14}}</string>
 																			<reference key="NSSuperview" ref="378280175"/>
+																			<reference key="NSWindow"/>
 																			<object class="NSTextContainer" key="NSTextContainer" id="178117438">
 																				<object class="NSLayoutManager" key="NSLayoutManager">
 																					<object class="NSTextStorage" key="NSTextStorage">
 																					<nil key="NSDelegate"/>
 																				</object>
 																				<reference key="NSTextView" ref="1057217485"/>
-																				<double key="NSWidth">0.0</double>
+																				<double key="NSWidth">0.001</double>
 																				<int key="NSTCFlags">1</int>
 																			</object>
 																			<object class="NSTextViewSharedData" key="NSSharedData">
 																			</object>
 																			<int key="NSTVFlags">7</int>
 																			<string key="NSMaxSize">{1e+07, 1e+07}</string>
+																			<string key="NSMinize">{0, 0}</string>
 																			<nil key="NSDelegate"/>
 																		</object>
 																	</object>
 																	<string key="NSFrameSize">{543, 290}</string>
 																	<reference key="NSSuperview" ref="554197517"/>
+																	<reference key="NSWindow"/>
 																	<reference key="NSNextKeyView" ref="1057217485"/>
 																	<reference key="NSDocView" ref="1057217485"/>
 																	<reference key="NSBGColor" ref="131218211"/>
 																	<int key="NSvFlags">-2147483392</int>
 																	<string key="NSFrame">{{271, 1}, {15, 237}}</string>
 																	<reference key="NSSuperview" ref="554197517"/>
+																	<reference key="NSWindow"/>
 																	<reference key="NSTarget" ref="554197517"/>
 																	<string key="NSAction">_doScroller:</string>
 																	<double key="NSPercent">0.95364236831665039</double>
 																	<int key="NSvFlags">-2147483392</int>
 																	<string key="NSFrame">{{1, 238}, {285, 15}}</string>
 																	<reference key="NSSuperview" ref="554197517"/>
+																	<reference key="NSWindow"/>
 																	<int key="NSsFlags">1</int>
 																	<reference key="NSTarget" ref="554197517"/>
 																	<string key="NSAction">_doScroller:</string>
 															</object>
 															<string key="NSFrameSize">{543, 290}</string>
 															<reference key="NSSuperview" ref="168465909"/>
+															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="378280175"/>
 															<int key="NSsFlags">560</int>
 															<reference key="NSVScroller" ref="31961279"/>
 																	</object>
 																	<string key="NSFrame">{{20, 20}, {503, 250}}</string>
 																	<reference key="NSSuperview" ref="49166770"/>
+																	<reference key="NSWindow"/>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSImageCell" key="NSCell" id="587628213">
 																		<int key="NSCellFlags">130560</int>
 															</object>
 															<string key="NSFrameSize">{543, 290}</string>
 															<reference key="NSSuperview" ref="168465909"/>
+															<reference key="NSWindow"/>
 															<object class="NSColor" key="BWGBFillStartingColor">
 																<int key="NSColorSpace">1</int>
 																<bytes key="NSRGB">MC42NzU3Njg0OTQ2IDAuNzIxOTQ4MTQ2OCAwLjc2NTMwNjExNTIAA</bytes>
 													</object>
 													<string key="NSFrame">{{257, 0}, {543, 315}}</string>
 													<reference key="NSSuperview" ref="928128656"/>
+													<reference key="NSWindow"/>
 													<string key="NSClassName">NSView</string>
 												</object>
 											</object>
 											<string key="NSFrameSize">{800, 315}</string>
 											<reference key="NSSuperview" ref="532081020"/>
+											<reference key="NSWindow"/>
 											<bool key="NSIsVertical">YES</bool>
 											<int key="NSDividerStyle">2</int>
 											<string key="NSAutosaveName">infoSplitter</string>
 									</object>
 									<string key="NSFrame">{{0, 173}, {800, 315}}</string>
 									<reference key="NSSuperview" ref="537766158"/>
+									<reference key="NSWindow"/>
 									<string key="NSClassName">NSView</string>
 								</object>
 							</object>
 							<string key="NSFrameSize">{800, 488}</string>
 							<reference key="NSSuperview" ref="118353878"/>
+							<reference key="NSWindow"/>
 							<string key="NSAutosaveName">splitter</string>
 							<reference key="BWSVColor" ref="102226568"/>
 							<bool key="BWSVColorIsEnabled">NO</bool>
 					</object>
 					<string key="NSFrameSize">{800, 488}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{600, 377}</string>
 						<reference key="NSOnImage" ref="705507820"/>
 						<reference key="NSMixedImage" ref="516194051"/>
 					</object>
+					<object class="NSMenuItem" id="429442870">
+						<reference key="NSMenu" ref="1043860070"/>
+						<string key="NSTitle">Resolve</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="705507820"/>
+						<reference key="NSMixedImage" ref="516194051"/>
+					</object>
+					<object class="NSMenuItem" id="181182569">
+						<reference key="NSMenu" ref="1043860070"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="705507820"/>
+						<reference key="NSMixedImage" ref="516194051"/>
+					</object>
 					<object class="NSMenuItem" id="863885537">
 						<reference key="NSMenu" ref="1043860070"/>
 						<string key="NSTitle">Commit Changes</string>
 							<reference key="NSSuperview" ref="192347478"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="445617133">
-								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">131072</int>
 								<string key="NSContents">Update working files</string>
 								<reference key="NSSupport" ref="26"/>
 					</object>
 					<int key="connectionID">300391</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">mergeToSelectedRevision:</string>
+						<reference key="source" ref="798535885"/>
+						<reference key="destination" ref="720927437"/>
+					</object>
+					<int key="connectionID">300393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showAllConflicts:</string>
+						<reference key="source" ref="798535885"/>
+						<reference key="destination" ref="475940907"/>
+					</object>
+					<int key="connectionID">300397</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">resolveConflict:</string>
+						<reference key="source" ref="798535885"/>
+						<reference key="destination" ref="1070855580"/>
+					</object>
+					<int key="connectionID">300401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">resolveConflict:</string>
+						<reference key="source" ref="798535885"/>
+						<reference key="destination" ref="429442870"/>
+					</object>
+					<int key="connectionID">300404</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">resolveConflict:</string>
+						<reference key="source" ref="798535885"/>
+						<reference key="destination" ref="476385405"/>
+					</object>
+					<int key="connectionID">300407</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 							<reference ref="186433179"/>
 							<reference ref="871042364"/>
 							<reference ref="656707464"/>
+							<reference ref="720927437"/>
+							<reference ref="475940907"/>
+							<reference ref="1070855580"/>
 						</object>
 						<reference key="parent" ref="927202284"/>
 					</object>
 							<reference ref="863885537"/>
 							<reference ref="432292886"/>
 							<reference ref="23317075"/>
+							<reference ref="181182569"/>
+							<reference ref="429442870"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
 							<reference ref="695398276"/>
 							<reference ref="74903434"/>
 							<reference ref="382662061"/>
+							<reference ref="476385405"/>
+							<reference ref="127301567"/>
 						</object>
 						<reference key="parent" ref="756103436"/>
 					</object>
 						<reference key="object" ref="356574471"/>
 						<reference key="parent" ref="386084604"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300392</int>
+						<reference key="object" ref="720927437"/>
+						<reference key="parent" ref="46956025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300396</int>
+						<reference key="object" ref="475940907"/>
+						<reference key="parent" ref="46956025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300400</int>
+						<reference key="object" ref="1070855580"/>
+						<reference key="parent" ref="46956025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300402</int>
+						<reference key="object" ref="181182569"/>
+						<reference key="parent" ref="1043860070"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300403</int>
+						<reference key="object" ref="429442870"/>
+						<reference key="parent" ref="1043860070"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300405</int>
+						<reference key="object" ref="476385405"/>
+						<reference key="parent" ref="386084604"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300406</int>
+						<reference key="object" ref="127301567"/>
+						<reference key="parent" ref="386084604"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 					<string>300383.IBPluginDependency</string>
 					<string>300384.IBPluginDependency</string>
 					<string>300385.IBPluginDependency</string>
+					<string>300392.IBPluginDependency</string>
+					<string>300396.IBPluginDependency</string>
+					<string>300400.IBPluginDependency</string>
+					<string>300402.IBPluginDependency</string>
+					<string>300403.IBPluginDependency</string>
+					<string>300405.IBPluginDependency</string>
+					<string>300406.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
 					<string>6.ImportedFromIB2</string>
 					<string>8.IBPluginDependency</string>
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{136, 313}, {800, 488}}</string>
+					<string>{{66, 213}, {800, 488}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{136, 313}, {800, 488}}</string>
+					<string>{{66, 213}, {800, 488}}</string>
 					<integer value="1"/>
 					<string>{{166, 135}, {586, 488}}</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{420, 1025}, {616, 0}}</string>
+					<string>{{100, 567}, {616, 0}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{151, 623}, {616, 0}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{47, 754}, {236, 153}}</string>
+					<string>{{47, 573}, {236, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{58, 562}, {239, 153}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{449, 382}, {478, 124}}</string>
+					<string>{{229, 400}, {478, 124}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{449, 382}, {478, 124}}</string>
+					<string>{{229, 400}, {478, 124}}</string>
 					<integer value="0"/>
 					<string>{{373, 518}, {478, 124}}</string>
 					<integer value="1"/>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
-					<string>{{91, 441}, {193, 152}}</string>
+					<string>{{54, 57}, {193, 179}}</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">300391</int>
+			<int key="maxID">300407</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 					<string key="className">NSWindow</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../library/MYUtilities/MYWindowUtils.h</string>
+						<string key="minorKey">../MYUtilities/MYWindowUtils.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
 							<string>discardChanges:</string>
 							<string>endCommitSheet:</string>
 							<string>infoChooserChanged:</string>
+							<string>mergeToSelectedRevision:</string>
 							<string>openInTerminal:</string>
 							<string>openSelectedFile:</string>
 							<string>pushPullRevisions:</string>
 							<string>refreshStatus:</string>
 							<string>removeFromRepository:</string>
+							<string>resolveConflict:</string>
 							<string>revealInFinder:</string>
+							<string>showAllConflicts:</string>
 							<string>showComparison:</string>
 							<string>showDiff:</string>
 							<string>showRevision:</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1050" key="NS.object.0"/>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">../Murky.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>NSActionTemplate</string>
+				<string>toolbar_add</string>
+				<string>toolbar_addremove</string>
+				<string>toolbar_allconflicts</string>
+				<string>toolbar_clone_repository_to</string>
+				<string>toolbar_commit</string>
+				<string>toolbar_commitall</string>
+				<string>toolbar_compare</string>
+				<string>toolbar_diff</string>
+				<string>toolbar_discard</string>
+				<string>toolbar_merge</string>
+				<string>toolbar_pull</string>
+				<string>toolbar_push</string>
+				<string>toolbar_refresh</string>
+				<string>toolbar_remove</string>
+				<string>toolbar_resolve</string>
+				<string>toolbar_reveal</string>
+				<string>toolbar_terminal</string>
+				<string>toolbar_update</string>
+				<string>toolbar_update_to_revision</string>
+				<string>toolbar_view_revision</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{15, 15}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+				<string>{32, 32}</string>
+			</object>
+		</object>
 	</data>
 </archive>

File Localize.json

     "English.lproj/MainMenu.xib": "4e93964b3a4de3e2acf8477112c04720", 
     "German.lproj/Projects.strings": "8554bdd35568c0d598d3f5b322836067", 
     "German.lproj/Repo.strings": "8bb4aeacd068f7b82e02806076095383", 
-    "English.lproj/Repo.xib": "ccb6c3a7e568f68cd1d37ae1f8ef2770", 
+    "English.lproj/Repo.xib": "a69543660f4a692d09d9c616801be759", 
     "German.lproj/MainMenu.strings": "aa69dae50fd262857497ba56606ac537"
 }

File Murky.xcodeproj/project.pbxproj

 	objects = {
 
 /* Begin PBXBuildFile section */
+		0041022A1140F97D00717B62 /* no_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 73ACF87810F715E4003304B2 /* no_file.png */; };
+		0041022B1140F97D00717B62 /* status_deleted.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C3C1012BB0D00EF650A /* status_deleted.png */; };
+		0041022C1140F97D00717B62 /* status_ignored.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C141012B9DA00EF650A /* status_ignored.png */; };
+		0041022D1140F97D00717B62 /* status_needs_update.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C151012B9DA00EF650A /* status_needs_update.png */; };
+		0041022E1140F97D00717B62 /* toolbar_revert.png in Resources */ = {isa = PBXBuildFile; fileRef = 73235B8E10129EFD00FAA680 /* toolbar_revert.png */; };
+		0041022F1140F97D00717B62 /* toolbar_addremove.png in Resources */ = {isa = PBXBuildFile; fileRef = 7300A4F610DA29E2009C0BE4 /* toolbar_addremove.png */; };
+		004102301140F97D00717B62 /* toolbar_quicklook.png in Resources */ = {isa = PBXBuildFile; fileRef = 7300A4F710DA29E2009C0BE4 /* toolbar_quicklook.png */; };
+		004102311140F97D00717B62 /* toolbar_tag.png in Resources */ = {isa = PBXBuildFile; fileRef = 7300A4F810DA29E2009C0BE4 /* toolbar_tag.png */; };
+		004102321140F97D00717B62 /* toolbar_merge.png in Resources */ = {isa = PBXBuildFile; fileRef = 73235B231012651800FAA680 /* toolbar_merge.png */; };
+		004102331140F97D00717B62 /* toolbar_branch.png in Resources */ = {isa = PBXBuildFile; fileRef = 73235B241012651800FAA680 /* toolbar_branch.png */; };
+		004102341140F97D00717B62 /* toolbar_view_revision.png in Resources */ = {isa = PBXBuildFile; fileRef = 736AC3ED101096B500157930 /* toolbar_view_revision.png */; };
+		004102351140F97D00717B62 /* toolbar_clone_repository_to.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973D10107FDE00B717B2 /* toolbar_clone_repository_to.png */; };
+		004102361140F97D00717B62 /* toolbar_update_to_revision.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973B10107F5700B717B2 /* toolbar_update_to_revision.png */; };
+		004102371140F97D00717B62 /* toolbar_reveal.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973910107F2100B717B2 /* toolbar_reveal.png */; };
+		004102381140F97D00717B62 /* status_null.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5160FBC376E00512681 /* status_null.png */; };
+		004102391140F97D00717B62 /* status_removed.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5110FBC363100512681 /* status_removed.png */; };
+		0041023A1140F97D00717B62 /* toolbar_terminal.png in Resources */ = {isa = PBXBuildFile; fileRef = 73CA81F910135B360081F0D8 /* toolbar_terminal.png */; };
+		0041023B1140F97D00717B62 /* status_nottracked.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A50D0FBC329500512681 /* status_nottracked.png */; };
+		0041023C1140F97D00717B62 /* status_modified.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5080FBC318400512681 /* status_modified.png */; };
+		0041023D1140F97D00717B62 /* status_added.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A4DE0FBC2BC000512681 /* status_added.png */; };
+		0041023E1140F97D00717B62 /* status_test.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A4910FBC26A200512681 /* status_test.png */; };
+		0041023F1140F97D00717B62 /* toolbar_discard.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A40F0FBC0FD800512681 /* toolbar_discard.png */; };
+		004102401140F97D00717B62 /* toolbar_refresh.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A4100FBC0FD800512681 /* toolbar_refresh.png */; };
+		004102411140F97D00717B62 /* mercurial-logo-official.icns in Resources */ = {isa = PBXBuildFile; fileRef = 277E135C10D5CAD800508D2B /* mercurial-logo-official.icns */; };
+		004102421140F97D00717B62 /* Murky.icns in Resources */ = {isa = PBXBuildFile; fileRef = 277E134310D5CA3400508D2B /* Murky.icns */; };
+		004102431140F97D00717B62 /* BitbucketFavIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 27E771CB0FB01124006504EF /* BitbucketFavIcon.png */; };
+		004102441140F97D00717B62 /* toolbar_add.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4640FBB200600290049 /* toolbar_add.png */; };
+		004102451140F97D00717B62 /* toolbar_commit.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4650FBB200600290049 /* toolbar_commit.png */; };
+		004102461140F97D00717B62 /* toolbar_commitall.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4660FBB200600290049 /* toolbar_commitall.png */; };
+		004102471140F97D00717B62 /* toolbar_compare.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4670FBB200600290049 /* toolbar_compare.png */; };
+		004102481140F97D00717B62 /* toolbar_diff.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4680FBB200600290049 /* toolbar_diff.png */; };
+		004102491140F97D00717B62 /* toolbar_pull.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4690FBB200600290049 /* toolbar_pull.png */; };
+		0041024A1140F97D00717B62 /* toolbar_push.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46A0FBB200600290049 /* toolbar_push.png */; };
+		0041024B1140F97D00717B62 /* toolbar_remove.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46B0FBB200600290049 /* toolbar_remove.png */; };
+		0041024C1140F97D00717B62 /* toolbar_update.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46C0FBB200600290049 /* toolbar_update.png */; };
+		0041024E1140F99B00717B62 /* toolbar_allconflicts.png in Resources */ = {isa = PBXBuildFile; fileRef = 0041024D1140F99B00717B62 /* toolbar_allconflicts.png */; };
+		0078DD7F1142539500649710 /* toolbar_resolve.png in Resources */ = {isa = PBXBuildFile; fileRef = 0078DD7E1142539500649710 /* toolbar_resolve.png */; };
+		0078DDDB114287FF00649710 /* status_conflict.png in Resources */ = {isa = PBXBuildFile; fileRef = 0078DDDA114287FF00649710 /* status_conflict.png */; };
 		270E509D0C56A5400069C9C6 /* HgDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 270E509C0C56A5400069C9C6 /* HgDir.m */; };
 		270E51290C56AD520069C9C6 /* HgLogOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 270E51280C56AD520069C9C6 /* HgLogOperation.m */; };
 		270E512D0C56AED10069C9C6 /* changeset.tmpl in Resources */ = {isa = PBXBuildFile; fileRef = 270E512B0C56AED10069C9C6 /* changeset.tmpl */; };
 		277C50930C55BCB800E60690 /* MercurialApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 277C50920C55BCB800E60690 /* MercurialApp.m */; };
 		277C52120C56761000E60690 /* HgOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 277C52110C56761000E60690 /* HgOperation.m */; };
 		277D16B90C989715001D8600 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 277D16B80C989715001D8600 /* libicucore.dylib */; };
-		277E134410D5CA3400508D2B /* Murky.icns in Resources */ = {isa = PBXBuildFile; fileRef = 277E134310D5CA3400508D2B /* Murky.icns */; };
 		27874C5E10FBD8BF00F0B178 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27874C3310FBD53400F0B178 /* BWToolkitFramework.framework */; };
 		27874C9310FBDA4800F0B178 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27874C3310FBD53400F0B178 /* BWToolkitFramework.framework */; };
 		279089880FBFD9CC00CEA97E /* RevisionDescriptionTemplate.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 279089860FBFD9CC00CEA97E /* RevisionDescriptionTemplate.rtf */; };
 		27D124F60C8F501B0075446A /* URLFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 27D124F50C8F501B0075446A /* URLFormatter.m */; };
 		27D918810C890F5500D53A8D /* xmlminimal.style in Resources */ = {isa = PBXBuildFile; fileRef = 27D918800C890F5500D53A8D /* xmlminimal.style */; };
 		27E396FA10E88314009F99ED /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 27E396F810E88314009F99ED /* Localizable.strings */; };
-		27E771CC0FB01124006504EF /* BitbucketFavIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 27E771CB0FB01124006504EF /* BitbucketFavIcon.png */; };
 		27E772930FB09EA7006504EF /* MYWindowUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 27E772920FB09EA7006504EF /* MYWindowUtils.m */; };
-		27FEB46D0FBB200600290049 /* toolbar_add.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4640FBB200600290049 /* toolbar_add.png */; };
-		27FEB46E0FBB200600290049 /* toolbar_commit.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4650FBB200600290049 /* toolbar_commit.png */; };
-		27FEB46F0FBB200600290049 /* toolbar_commitall.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4660FBB200600290049 /* toolbar_commitall.png */; };
-		27FEB4700FBB200600290049 /* toolbar_compare.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4670FBB200600290049 /* toolbar_compare.png */; };
-		27FEB4710FBB200600290049 /* toolbar_diff.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4680FBB200600290049 /* toolbar_diff.png */; };
-		27FEB4720FBB200600290049 /* toolbar_pull.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4690FBB200600290049 /* toolbar_pull.png */; };
-		27FEB4730FBB200600290049 /* toolbar_push.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46A0FBB200600290049 /* toolbar_push.png */; };
-		27FEB4740FBB200600290049 /* toolbar_remove.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46B0FBB200600290049 /* toolbar_remove.png */; };
-		27FEB4750FBB200600290049 /* toolbar_update.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46C0FBB200600290049 /* toolbar_update.png */; };
 		27FEB4860FBB209D00290049 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4840FBB209D00290049 /* InfoPlist.strings */; };
-		7300A4F910DA29E2009C0BE4 /* toolbar_addremove.png in Resources */ = {isa = PBXBuildFile; fileRef = 7300A4F610DA29E2009C0BE4 /* toolbar_addremove.png */; };
-		7300A4FA10DA29E2009C0BE4 /* toolbar_quicklook.png in Resources */ = {isa = PBXBuildFile; fileRef = 7300A4F710DA29E2009C0BE4 /* toolbar_quicklook.png */; };
-		7300A4FB10DA29E2009C0BE4 /* toolbar_tag.png in Resources */ = {isa = PBXBuildFile; fileRef = 7300A4F810DA29E2009C0BE4 /* toolbar_tag.png */; };
-		73235B251012651800FAA680 /* toolbar_merge.png in Resources */ = {isa = PBXBuildFile; fileRef = 73235B231012651800FAA680 /* toolbar_merge.png */; };
-		73235B261012651800FAA680 /* toolbar_branch.png in Resources */ = {isa = PBXBuildFile; fileRef = 73235B241012651800FAA680 /* toolbar_branch.png */; };
-		73235B8F10129EFD00FAA680 /* toolbar_revert.png in Resources */ = {isa = PBXBuildFile; fileRef = 73235B8E10129EFD00FAA680 /* toolbar_revert.png */; };
 		7341D0BF10F470E000076123 /* IconTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7341D0BE10F470E000076123 /* IconTextCell.m */; };
-		7364973A10107F2100B717B2 /* toolbar_reveal.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973910107F2100B717B2 /* toolbar_reveal.png */; };
-		7364973C10107F5700B717B2 /* toolbar_update_to_revision.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973B10107F5700B717B2 /* toolbar_update_to_revision.png */; };
-		7364973E10107FDE00B717B2 /* toolbar_clone_repository_to.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973D10107FDE00B717B2 /* toolbar_clone_repository_to.png */; };
-		736AC3F0101096B500157930 /* toolbar_view_revision.png in Resources */ = {isa = PBXBuildFile; fileRef = 736AC3ED101096B500157930 /* toolbar_view_revision.png */; };
-		73864C171012B9DA00EF650A /* status_ignored.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C141012B9DA00EF650A /* status_ignored.png */; };
-		73864C181012B9DA00EF650A /* status_needs_update.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C151012B9DA00EF650A /* status_needs_update.png */; };
-		73864C3D1012BB0D00EF650A /* status_deleted.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C3C1012BB0D00EF650A /* status_deleted.png */; };
-		73ACF87910F715E4003304B2 /* no_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 73ACF87810F715E4003304B2 /* no_file.png */; };
-		73CA81FA10135B360081F0D8 /* toolbar_terminal.png in Resources */ = {isa = PBXBuildFile; fileRef = 73CA81F910135B360081F0D8 /* toolbar_terminal.png */; };
 		73CA82D710135FC10081F0D8 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CA82D610135FC10081F0D8 /* ScriptingBridge.framework */; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-		D095A4110FBC0FD800512681 /* toolbar_discard.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A40F0FBC0FD800512681 /* toolbar_discard.png */; };
-		D095A4120FBC0FD800512681 /* toolbar_refresh.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A4100FBC0FD800512681 /* toolbar_refresh.png */; };
-		D095A4920FBC26A200512681 /* status_test.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A4910FBC26A200512681 /* status_test.png */; };
-		D095A4DF0FBC2BC000512681 /* status_added.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A4DE0FBC2BC000512681 /* status_added.png */; };
-		D095A5090FBC318400512681 /* status_modified.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5080FBC318400512681 /* status_modified.png */; };
-		D095A50E0FBC329500512681 /* status_nottracked.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A50D0FBC329500512681 /* status_nottracked.png */; };
-		D095A5120FBC363100512681 /* status_removed.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5110FBC363100512681 /* status_removed.png */; };
-		D095A5170FBC376E00512681 /* status_null.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5160FBC376E00512681 /* status_null.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0041024D1140F99B00717B62 /* toolbar_allconflicts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = toolbar_allconflicts.png; path = ../Murky/Resources/Icons/toolbar_allconflicts.png; sourceTree = SOURCE_ROOT; };
+		0078DD7E1142539500649710 /* toolbar_resolve.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = toolbar_resolve.png; path = ../Murky/Resources/Icons/toolbar_resolve.png; sourceTree = SOURCE_ROOT; };
+		0078DDDA114287FF00649710 /* status_conflict.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_conflict.png; path = ../Murky/Resources/Icons/status_conflict.png; sourceTree = SOURCE_ROOT; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		270E509B0C56A5400069C9C6 /* HgDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HgDir.h; sourceTree = "<group>"; };
 		270E509C0C56A5400069C9C6 /* HgDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HgDir.m; sourceTree = "<group>"; };
 		27FEB4630FBB200600290049 /* Icons */ = {
 			isa = PBXGroup;
 			children = (
+				0078DDDA114287FF00649710 /* status_conflict.png */,
+				0078DD7E1142539500649710 /* toolbar_resolve.png */,
+				0041024D1140F99B00717B62 /* toolbar_allconflicts.png */,
 				73ACF87810F715E4003304B2 /* no_file.png */,
 				73864C3C1012BB0D00EF650A /* status_deleted.png */,
 				73864C141012B9DA00EF650A /* status_ignored.png */,
 				27C657A10FAEA7E800CFB909 /* Projects.xib in Resources */,
 				27C657A60FAEA80D00CFB909 /* Repo.xib in Resources */,
 				27C657AA0FAEA82300CFB909 /* MainMenu.xib in Resources */,
-				27E771CC0FB01124006504EF /* BitbucketFavIcon.png in Resources */,
-				27FEB46D0FBB200600290049 /* toolbar_add.png in Resources */,
-				27FEB46E0FBB200600290049 /* toolbar_commit.png in Resources */,
-				27FEB46F0FBB200600290049 /* toolbar_commitall.png in Resources */,
-				27FEB4700FBB200600290049 /* toolbar_compare.png in Resources */,
-				27FEB4710FBB200600290049 /* toolbar_diff.png in Resources */,
-				27FEB4720FBB200600290049 /* toolbar_pull.png in Resources */,
-				27FEB4730FBB200600290049 /* toolbar_push.png in Resources */,
-				27FEB4740FBB200600290049 /* toolbar_remove.png in Resources */,
-				27FEB4750FBB200600290049 /* toolbar_update.png in Resources */,
 				27FEB4860FBB209D00290049 /* InfoPlist.strings in Resources */,
-				D095A4110FBC0FD800512681 /* toolbar_discard.png in Resources */,
-				D095A4120FBC0FD800512681 /* toolbar_refresh.png in Resources */,
-				D095A4920FBC26A200512681 /* status_test.png in Resources */,
-				D095A4DF0FBC2BC000512681 /* status_added.png in Resources */,
-				D095A5090FBC318400512681 /* status_modified.png in Resources */,
-				D095A50E0FBC329500512681 /* status_nottracked.png in Resources */,
-				D095A5120FBC363100512681 /* status_removed.png in Resources */,
-				D095A5170FBC376E00512681 /* status_null.png in Resources */,
 				279089880FBFD9CC00CEA97E /* RevisionDescriptionTemplate.rtf in Resources */,
-				7364973A10107F2100B717B2 /* toolbar_reveal.png in Resources */,
-				7364973C10107F5700B717B2 /* toolbar_update_to_revision.png in Resources */,
-				7364973E10107FDE00B717B2 /* toolbar_clone_repository_to.png in Resources */,
-				736AC3F0101096B500157930 /* toolbar_view_revision.png in Resources */,
-				73235B251012651800FAA680 /* toolbar_merge.png in Resources */,
-				73235B261012651800FAA680 /* toolbar_branch.png in Resources */,
-				73235B8F10129EFD00FAA680 /* toolbar_revert.png in Resources */,
-				73864C171012B9DA00EF650A /* status_ignored.png in Resources */,
-				73864C181012B9DA00EF650A /* status_needs_update.png in Resources */,
-				73864C3D1012BB0D00EF650A /* status_deleted.png in Resources */,
-				73CA81FA10135B360081F0D8 /* toolbar_terminal.png in Resources */,
-				277E134410D5CA3400508D2B /* Murky.icns in Resources */,
-				7300A4F910DA29E2009C0BE4 /* toolbar_addremove.png in Resources */,
-				7300A4FA10DA29E2009C0BE4 /* toolbar_quicklook.png in Resources */,
-				7300A4FB10DA29E2009C0BE4 /* toolbar_tag.png in Resources */,
 				27E396FA10E88314009F99ED /* Localizable.strings in Resources */,
-				73ACF87910F715E4003304B2 /* no_file.png in Resources */,
+				0041022A1140F97D00717B62 /* no_file.png in Resources */,
+				0041022B1140F97D00717B62 /* status_deleted.png in Resources */,
+				0041022C1140F97D00717B62 /* status_ignored.png in Resources */,
+				0041022D1140F97D00717B62 /* status_needs_update.png in Resources */,
+				0041022E1140F97D00717B62 /* toolbar_revert.png in Resources */,
+				0041022F1140F97D00717B62 /* toolbar_addremove.png in Resources */,
+				004102301140F97D00717B62 /* toolbar_quicklook.png in Resources */,
+				004102311140F97D00717B62 /* toolbar_tag.png in Resources */,
+				004102321140F97D00717B62 /* toolbar_merge.png in Resources */,
+				004102331140F97D00717B62 /* toolbar_branch.png in Resources */,
+				004102341140F97D00717B62 /* toolbar_view_revision.png in Resources */,
+				004102351140F97D00717B62 /* toolbar_clone_repository_to.png in Resources */,
+				004102361140F97D00717B62 /* toolbar_update_to_revision.png in Resources */,
+				004102371140F97D00717B62 /* toolbar_reveal.png in Resources */,
+				004102381140F97D00717B62 /* status_null.png in Resources */,
+				004102391140F97D00717B62 /* status_removed.png in Resources */,
+				0041023A1140F97D00717B62 /* toolbar_terminal.png in Resources */,
+				0041023B1140F97D00717B62 /* status_nottracked.png in Resources */,
+				0041023C1140F97D00717B62 /* status_modified.png in Resources */,
+				0041023D1140F97D00717B62 /* status_added.png in Resources */,
+				0041023E1140F97D00717B62 /* status_test.png in Resources */,
+				0041023F1140F97D00717B62 /* toolbar_discard.png in Resources */,
+				004102401140F97D00717B62 /* toolbar_refresh.png in Resources */,
+				004102411140F97D00717B62 /* mercurial-logo-official.icns in Resources */,
+				004102421140F97D00717B62 /* Murky.icns in Resources */,
+				004102431140F97D00717B62 /* BitbucketFavIcon.png in Resources */,
+				004102441140F97D00717B62 /* toolbar_add.png in Resources */,
+				004102451140F97D00717B62 /* toolbar_commit.png in Resources */,
+				004102461140F97D00717B62 /* toolbar_commitall.png in Resources */,
+				004102471140F97D00717B62 /* toolbar_compare.png in Resources */,
+				004102481140F97D00717B62 /* toolbar_diff.png in Resources */,
+				004102491140F97D00717B62 /* toolbar_pull.png in Resources */,
+				0041024A1140F97D00717B62 /* toolbar_push.png in Resources */,
+				0041024B1140F97D00717B62 /* toolbar_remove.png in Resources */,
+				0041024C1140F97D00717B62 /* toolbar_update.png in Resources */,
+				0041024E1140F99B00717B62 /* toolbar_allconflicts.png in Resources */,
+				0078DD7F1142539500649710 /* toolbar_resolve.png in Resources */,
+				0078DDDB114287FF00649710 /* status_conflict.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

File Resources/Icons/status_conflict.png

Added
New image

File Resources/Icons/toolbar_allconflicts.png

Added
New image

File Resources/Icons/toolbar_resolve.png

Added
New image

File Resources/Icons/toolbar_rollback.png

Added
New image

File Resources/Info.plist

 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>© Jens Alfke, 2008-2010</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.7.1</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.7</string>
+	<string>0.7.2</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© Jens Alfke, 2008-2010</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

File Source/HgDir.h

 - (void) _computeStatus;
 - (void) _removeFile: (HgFile*)file;
 
+
+// Added By Robin
+- (void) updateSomeFilesStatusFromOutputAfterResolve: (NSArray*)statusLines;
+
+
 @end

File Source/HgDir.m

 }
 
 
+#pragma mark -
+#pragma mark ====Added By Robin====
+#pragma mark -
+
+#pragma mark -
+#pragma mark Update some files' status,not all files
+- (void) updateSomeFilesStatusFromOutputAfterResolve: (NSArray*)statusLines
+{
+    NSString *myPath = self.path;
+    NSMutableSet *oldFiles = [NSMutableSet setWithArray: [self allFilesMatching: TruePredicate]];
+    
+    for( NSString *line in statusLines ) {
+        if( line.length > 0 ) {
+            if( line.length<3 || [line characterAtIndex: 1] != ' ' ) {
+                Warn(@"No file unresolved: \"%@\"",line);
+                continue;
+            }
+            HgStatus status = (HgStatus) [line characterAtIndex: 0];
+            if( status == KUnresolve) {
+                // Get path relative to me:
+                NSString *path = [line substringFromIndex: 2];
+                if( myPath.length > 0 && ! [path hasPrefix: myPath] )
+                    continue;
+                else if (status == kNotTracked && [path hasSuffix: @".orig"]) {
+                    // Ignore .orig files not in repo; they're backups from 'hg revert'.
+                    LogTo(HgFile,@"Ignoring backup: %@", line);
+                    continue;
+                }
+                // OK, add/update it:
+                path = [path substringFromIndex: myPath.length];
+                HgFile *file = [self addFileWithPath: path];
+                if (status != file.status)
+                    file.status = status;
+                [oldFiles removeObject: file];
+                LogTo(HgFile,@"    %c %@", file.status,file.path);
+            }
+        }
+    }
+    
+    // Remove files that didn't appear in the list:
+    //for( HgFile *file in oldFiles )
+//        [file remove];
+    
+    // Status changes may propagate all the way up to the root
+    [self.root _computeStatus];
+}
+
+
+
 @end

File Source/HgFile.h

 typedef enum {              // these are the characters output by 'hg status'
     kClean = 'C',
     kModified = 'M',
-    kNeedsUpdate = 'U',
+    //kNeedsUpdate = 'U',  // 'hg status' commond has no this. -- Robin
     kAdded = 'A',
     kRemoved = 'R',
     kDeleted = '!',
     kIgnored = 'I',
-    kNotTracked = '?'
+    kNotTracked = '?',
+    KUnresolve = 'U'  // 'hg resolve --list' command will show all files which are unresolved.
 } HgStatus;
 
 

File Source/HgFile.m

 	
 	if( _status == kModified ){
 		return [NSImage imageNamed:@"status_modified"];
-	}else if( _status == kNeedsUpdate){
-		return [NSImage imageNamed:@"status_needs_update"];
-	}else if( _status == kAdded){
+	}
+    //else if( _status == kNeedsUpdate){
+//		return [NSImage imageNamed:@"status_needs_update"];
+//	}
+    else if( _status == kAdded){
 		return [NSImage imageNamed:@"status_added"];
 	}else if( _status == kRemoved){
 		return [NSImage imageNamed:@"status_removed"];
 	}else if( _status == kNotTracked){
 		return [NSImage imageNamed:@"status_nottracked"];
 	}
+    // Added By Robin
+    else if(_status == KUnresolve) {
+        return [NSImage imageNamed:@"status_conflict"];
+    }
     
 	return [NSImage imageNamed:@"status_null"];
 	

File Source/HgOperation.m

     }
     
     self = [super initWithCommand: sHgToolPath arguments: arguments];
+    
+    
     if (self != nil) {
         _subcommand = subcommand;
+        
+        Log(@"Command: %@", _subcommand);
+        
         if( dir ) {
             NSString *absPath = getAbsolutePath(dir);
             Assert(absPath.length>0, @"Bad absolutePath for %@ %@",[dir class],dir);

File Source/HgRepository.h

 - (BOOL) updateToRevision: (HgRevision*)rev     // nil means tip
                    output: (NSString**)outOutput
                     error: (NSError**)outError;
+- (BOOL) mergeToRevision: (HgRevision*)rev     // nil means tip
+                   output: (NSString**)outOutput
+                    error: (NSError**)outError;
+- (BOOL) showAllConflicts: (NSString**)outOutput
+                    error: (NSError**)outError;
 
 - (void) dumpTo: (NSMutableString*)dump;
 

File Source/HgRepository.m

 }
 
 
+#pragma mark -
+#pragma mark ====Added By Robin====
+#pragma mark -
+- (BOOL) mergeToRevision: (HgRevision*)rev     // nil means tip
+                   output: (NSString**)outOutput
+                    error: (NSError**)outError
+{
+    NSArray *args = nil;
+    if( rev ) {
+        Assert(!rev.isUncommitted,@"Can't merge to uncommitted revision");
+        args = [NSArray arrayWithObjects: @"--rev", rev.identifierString, nil];
+    }
+    HgOperation *op = [[HgOperation alloc] initWithDirectory: self
+                                                     command: @"merge"
+                                                   arguments: args];
+    [self ignoreNextFileChanges];
+    if( ! [op run: outError] )
+        return NO;
+    if( outOutput ) {
+        //if (op.output) {
+//            *outOutput = op.output;
+//        } else if (op.outputAndError) {
+//            *outOutput = op.outputAndError;
+//        }
+        *outOutput = op.outputAndError;
+        //*outOutput = op.output;
+    }
+    
+    [self _checkRevisions];
+    return YES;
+}
+
+
+- (BOOL) showAllConflicts: (NSString**)outOutput
+                   error: (NSError**)outError
+{
+    NSArray *args = nil;
+    args = [NSArray arrayWithObjects: @"--list", nil];
+    
+    HgOperation *op = [[HgOperation alloc] initWithDirectory: self
+                                                     command: @"resolve"
+                                                   arguments: args];
+    //[self ignoreNextFileChanges];
+    if( ! [op run: outError] )
+        return NO;
+    if( outOutput ) {
+        *outOutput = op.outputAndError;
+    }
+    
+    
+    return YES;
+}
+
 @end

File Source/HgRevision.m

                                                    arguments: args];
     if( [op run: outError] ) {
         [dir updateStatusFromOutput: [op.output componentsSeparatedByString: @"\n"]];
+        
+        // Added By Robin
+        //-- Check unresolved files
+        NSMutableArray *argments = [NSMutableArray array];
+        [argments addObjectsFromArray: [NSArray arrayWithObjects: @"--list", nil]];
+        
+        HgOperation *opCheckUnresolve = [[HgOperation alloc] initWithDirectory: self
+                                                         command: @"resolve"
+                                                       arguments: argments];
+        if ([opCheckUnresolve run: outError]) {
+            [dir updateSomeFilesStatusFromOutputAfterResolve: [opCheckUnresolve.output componentsSeparatedByString: @"\n"]];
+            return YES;
+        }
+        //---- End -----
+        
         return YES;
+        
     } else
         return NO;
 }    

File Source/HgUncommittedRevision.h

              message: (NSString*)message 
                error: (NSError**)error;
 
+
+//**  Added By Robin  **//
+- (BOOL) resolveFiles: (NSArray*)files
+               error: (NSError**)outError;
+
 @end

File Source/HgUncommittedRevision.m

 }
 
 
+#pragma mark -
+#pragma mark ====Added By Robin
+#pragma mark -
+
+#pragma mark -
+#pragma mark Resolve Action
+- (BOOL) resolveFiles: (NSArray*)files
+                error: (NSError**)outError {
+    
+    NSMutableArray *argments = [NSMutableArray array];
+    [argments addObjectsFromArray: [NSArray arrayWithObjects: @"--mark", @"R", nil]];
+    
+    
+    return [self applyCommand: @"resolve"
+                    arguments: argments
+                      toFiles: files
+                        error: outError];
+    
+}
+
 @end

File Source/RepoController.h

 
 - (IBAction) stopProgress: (id)sender;
 
+
+// Added by Robin
+- (IBAction) mergeToSelectedRevision: (id)sender;
+- (IBAction) showAllConflicts: (id)sender;
+- (IBAction) resolveConflict: (id)sender;
+
 @end

File Source/RepoController_Actions.m

 
 - (IBAction) updateToSelectedRevision: (id)sender
 {
+    
     HgRevision *rev = [self selectedRevision];
     if( rev==nil || rev.isUncommitted ) {
         NSBeep();
 }
 
 
+#pragma mark -
+#pragma mark ====Added by Robin====
+#pragma mark -
+
+#pragma mark -
+#pragma mark Show All Conflicts
+- (IBAction) showAllConflicts: (id)sender {
+    
+    NSError *error;
+    NSString *output;
+    if( [_repo showAllConflicts: &output error: &error] ) {
+        
+        NSMutableString *newOutput;
+        
+        if( ! output ) {
+            newOutput = [NSMutableString stringWithString:@"No file unresolved!"];
+        } else if (output.length < 1) {
+            newOutput = [NSMutableString stringWithString:@"No file unresolved!"];
+        } else {
+            newOutput = [NSMutableString stringWithString:output];
+            [newOutput appendString:@"(R is 'Resolve'; U is 'Unresolve')"];
+        }
+        NSBeginInformationalAlertSheet(NSLocalizedString(@"All Conflicts", 
+                                                         @"All message after request all conflicts"),
+                                       nil, nil, nil, self.window, nil, NULL, NULL, NULL,
+                                       @"%@", newOutput);
+        
+    } else        
+        [self presentError: error];
+    
+}
+
+#pragma mark -
+#pragma mark Resolve All Conflicts
+- (IBAction) resolveConflict: (id)sender {
+    
+    NSArray *files = self._uncommittedSelectedFiles;
+    if( files )
+        NSBeginCriticalAlertSheet(NSLocalizedString(@"Resolve conflict?", 
+                                                    @"Title of Resolve alert"),
+                                  NSLocalizedString(@"Resolve", 
+                                                    @"Default button of Resolve alert"),
+                                  NSLocalizedString(@"Cancel", @"Button"), nil,
+                                  self.window,self,
+                                  @selector(_resolveSheetDidEnd:returnCode:context:), NULL, files,
+                                  NSLocalizedString(@"Are you sure you have fixed all conflicts?", 
+                                                    @"Body of Resolve alert"));
+    
+    
+}
+
+- (void) _resolveSheetDidEnd: (NSPanel*)sheet returnCode: (int)returnCode context: (void*)context
+{
+    [sheet orderOut: self];
+    if( returnCode == NSOKButton ) {
+        NSError *error = nil;
+        if( ! [_repo.uncommittedRevision resolveFiles: (NSArray*)context
+                                               error: &error] ) {
+            [self presentError: error];
+        }
+    }
+}
+#pragma mark -
+#pragma mark Merge
+
+- (IBAction) _mergeTo: (HgRevision*)rev
+{
+    
+    NSError *error;
+    NSString *output;
+    if( [_repo mergeToRevision: rev output: &output error: &error] ) {
+        
+        if( ! output ) 
+            output = @"";
+        NSBeginInformationalAlertSheet(NSLocalizedString(@"Merge Completed", 
+                                                         @"Confirmation message after Merge"),
+                                       nil, nil, nil, self.window, nil, NULL, NULL, NULL,
+                                       @"%@", output);
+        
+    } else        
+        [self presentError: error];
+}
+
+
+- (IBAction) mergeToSelectedRevision: (id)sender {
+    
+    HgRevision *rev = [self selectedRevision];
+    if( rev==nil || rev.isUncommitted ) {
+        NSBeep();
+        return;
+    }
+    NSBeginCriticalAlertSheet(NSLocalizedString(@"Merge to revision?", 
+                                                @"Title of Merge alert"),
+                              NSLocalizedString(@"Merge", 
+                                                @"Default button of Merge alert"),
+                              NSLocalizedString(@"Cancel", @"Button"), nil,
+                              self.window,self,
+                              @selector(_mergeSheetDidEnd:returnCode:context:), NULL, rev,
+                              NSLocalizedString(@"Are you sure you want to merge the source tree to revision %i?", 
+                                                @"Body of Merge alert"),
+                              rev.localNumber);
+}
+
+- (void) _mergeSheetDidEnd: (NSPanel*)sheet returnCode: (int)returnCode context: (void*)context
+{
+    [sheet orderOut: self];
+    if( returnCode == NSOKButton )
+        [self _mergeTo: (HgRevision*)context];
+}
+
+
 @end