diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m
index 1ea24f31d..6f10156b7 100644
--- a/macosx/AddWindowController.m
+++ b/macosx/AddWindowController.m
@@ -190,6 +190,12 @@
 }
 
 - (void) cancelAdd: (id) sender
+{
+    [[self window] performClose: sender];
+}
+
+//only called on cancel
+- (BOOL) windowShouldClose: (id) window
 {
     [fTimer invalidate];
     fTimer = nil;
diff --git a/macosx/English.lproj/AddWindow.xib b/macosx/English.lproj/AddWindow.xib
index c607d7b5c..ef773ae16 100644
--- a/macosx/English.lproj/AddWindow.xib
+++ b/macosx/English.lproj/AddWindow.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">343.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="49"/>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -26,7 +26,7 @@
 				<string key="NSClassName" id="199511354">NSApplication</string>
 			</object>
 			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">13</int>
+				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{186, 418}, {414, 493}}</string>
 				<int key="NSWTFlags">536870912</int>
@@ -62,8 +62,8 @@
 							<object class="NSImageCell" key="NSCell" id="376748491">
 								<int key="NSCellFlags">130560</int>
 								<int key="NSCellFlags2">33554432</int>
-								<object class="NSCustomResource" key="NSContents" id="188505430">
-									<string key="NSClassName" id="523460450">NSImage</string>
+								<object class="NSCustomResource" key="NSContents" id="608860232">
+									<string key="NSClassName" id="96603079">NSImage</string>
 									<string key="NSResourceName">NSApplicationIcon</string>
 								</object>
 								<int key="NSAlign">0</int>
@@ -92,7 +92,7 @@
 								<reference key="NSControlView" ref="382094510"/>
 								<object class="NSColor" key="NSBackgroundColor" id="729622418">
 									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName" id="625985065">System</string>
+									<string key="NSCatalogName" id="1066521639">System</string>
 									<string key="NSColorName">controlColor</string>
 									<object class="NSColor" key="NSColor" id="407905340">
 										<int key="NSColorSpace">3</int>
@@ -101,7 +101,7 @@
 								</object>
 								<object class="NSColor" key="NSTextColor" id="932603584">
 									<int key="NSColorSpace">6</int>
-									<reference key="NSCatalogName" ref="625985065"/>
+									<reference key="NSCatalogName" ref="1066521639"/>
 									<string key="NSColorName">controlTextColor</string>
 									<object class="NSColor" key="NSColor" id="165035146">
 										<int key="NSColorSpace">3</int>
@@ -202,7 +202,7 @@
 							<object class="NSImageCell" key="NSCell" id="324048767">
 								<int key="NSCellFlags">130560</int>
 								<int key="NSCellFlags2">33554432</int>
-								<reference key="NSContents" ref="188505430"/>
+								<reference key="NSContents" ref="608860232"/>
 								<int key="NSAlign">0</int>
 								<int key="NSScale">1</int>
 								<int key="NSStyle">0</int>
@@ -326,12 +326,12 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<int key="NSState">1</int>
-									<object class="NSCustomResource" key="NSOnImage" id="694876170">
-										<reference key="NSClassName" ref="523460450"/>
+									<object class="NSCustomResource" key="NSOnImage" id="197698368">
+										<reference key="NSClassName" ref="96603079"/>
 										<string key="NSResourceName">NSMenuCheckmark</string>
 									</object>
-									<object class="NSCustomResource" key="NSMixedImage" id="988457715">
-										<reference key="NSClassName" ref="523460450"/>
+									<object class="NSCustomResource" key="NSMixedImage" id="189252989">
+										<reference key="NSClassName" ref="96603079"/>
 										<string key="NSResourceName">NSMenuMixedState</string>
 									</object>
 									<string key="NSAction">_popUpItemAction:</string>
@@ -350,8 +350,8 @@
 											<reference key="NSKeyEquiv" ref="751720803"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="694876170"/>
-											<reference key="NSMixedImage" ref="988457715"/>
+											<reference key="NSOnImage" ref="197698368"/>
+											<reference key="NSMixedImage" ref="189252989"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<int key="NSTag">-3</int>
 											<reference key="NSTarget" ref="693599709"/>
@@ -432,20 +432,20 @@
 														</object>
 														<object class="NSColor" key="NSTextColor" id="362182954">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="625985065"/>
+															<reference key="NSCatalogName" ref="1066521639"/>
 															<string key="NSColorName">headerTextColor</string>
 															<reference key="NSColor" ref="165035146"/>
 														</object>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="854727005">
-														<int key="NSCellFlags">1411513920</int>
+														<int key="NSCellFlags">337772096</int>
 														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents" id="679940024">Text Cell</string>
+														<string key="NSContents" id="889340559">Text Cell</string>
 														<reference key="NSSupport" ref="728563564"/>
 														<reference key="NSControlView" ref="591175582"/>
 														<object class="NSColor" key="NSBackgroundColor" id="925881442">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="625985065"/>
+															<reference key="NSCatalogName" ref="1066521639"/>
 															<string key="NSColorName">controlBackgroundColor</string>
 															<reference key="NSColor" ref="407905340"/>
 														</object>
@@ -467,7 +467,7 @@
 														<reference key="NSSupport" ref="26"/>
 														<object class="NSColor" key="NSBackgroundColor" id="211491450">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="625985065"/>
+															<reference key="NSCatalogName" ref="1066521639"/>
 															<string key="NSColorName">headerColor</string>
 															<object class="NSColor" key="NSColor" id="411117033">
 																<int key="NSColorSpace">3</int>
@@ -510,9 +510,9 @@
 														<reference key="NSTextColor" ref="362182954"/>
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="422188465">
-														<int key="NSCellFlags">1411513920</int>
+														<int key="NSCellFlags">337772096</int>
 														<int key="NSCellFlags2">134219776</int>
-														<reference key="NSContents" ref="679940024"/>
+														<reference key="NSContents" ref="889340559"/>
 														<reference key="NSSupport" ref="728563564"/>
 														<reference key="NSControlView" ref="591175582"/>
 														<reference key="NSBackgroundColor" ref="925881442"/>
@@ -526,7 +526,7 @@
 											<reference key="NSBackgroundColor" ref="411117033"/>
 											<object class="NSColor" key="NSGridColor">
 												<int key="NSColorSpace">6</int>
-												<reference key="NSCatalogName" ref="625985065"/>
+												<reference key="NSCatalogName" ref="1066521639"/>
 												<string key="NSColorName">gridColor</string>
 												<object class="NSColor" key="NSColor">
 													<int key="NSColorSpace">3</int>
@@ -615,7 +615,7 @@
 								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
 								<object class="NSCustomResource" key="NSNormalImage">
-									<reference key="NSClassName" ref="523460450"/>
+									<reference key="NSClassName" ref="96603079"/>
 									<string key="NSResourceName">NSSwitch</string>
 								</object>
 								<reference key="NSAlternateImage" ref="240636852"/>
@@ -1350,58 +1350,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">FileOutlineView</string>
-					<string key="superclassName">NSOutlineView</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey" id="268066477">IBProjectSource</string>
-						<string key="minorKey">macosx/FileOutlineView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenu</string>
-					<nil key="superclassName"/>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
-						<string key="minorKey">macosx/NSMenuAdditions.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">AddWindowController</string>
 					<string key="superclassName">NSWindowController</string>
@@ -1417,11 +1365,11 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string id="40190294">id</string>
-							<reference ref="40190294"/>
-							<reference ref="40190294"/>
-							<reference ref="40190294"/>
-							<reference ref="40190294"/>
+							<string id="861371326">id</string>
+							<reference ref="861371326"/>
+							<reference ref="861371326"/>
+							<reference ref="861371326"/>
+							<reference ref="861371326"/>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -1452,7 +1400,7 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
+						<string key="majorKey" id="376310149">IBProjectSource</string>
 						<string key="minorKey">macosx/AddWindowController.h</string>
 					</object>
 				</object>
@@ -1478,8 +1426,8 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
-						<string key="minorKey">macosx/IPCController.h</string>
+						<reference key="majorKey" ref="376310149"/>
+						<string key="minorKey">macosx/UKKQueue/UKMainThreadProxy.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1504,33 +1452,7 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
-						<string key="minorKey">macosx/UKKQueue/UKFileWatcher.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<reference key="className" ref="746918514"/>
-					<nil key="superclassName"/>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
+						<reference key="majorKey" ref="376310149"/>
 						<string key="minorKey">macosx/UKKQueue/UKKQueue.h</string>
 					</object>
 				</object>
@@ -1556,8 +1478,86 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
-						<string key="minorKey">macosx/UKKQueue/UKMainThreadProxy.h</string>
+						<reference key="majorKey" ref="376310149"/>
+						<string key="minorKey">macosx/UKKQueue/UKFileWatcher.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<reference key="className" ref="746918514"/>
+					<nil key="superclassName"/>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<reference key="majorKey" ref="376310149"/>
+						<string key="minorKey">macosx/IPCController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">FileOutlineView</string>
+					<string key="superclassName">NSOutlineView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<reference key="majorKey" ref="376310149"/>
+						<string key="minorKey">macosx/FileOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenu</string>
+					<nil key="superclassName"/>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<reference key="majorKey" ref="376310149"/>
+						<string key="minorKey">macosx/NSMenuAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1574,10 +1574,10 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="40190294"/>
-							<reference ref="40190294"/>
-							<reference ref="40190294"/>
-							<reference ref="40190294"/>
+							<reference ref="861371326"/>
+							<reference ref="861371326"/>
+							<reference ref="861371326"/>
+							<reference ref="861371326"/>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -1585,7 +1585,7 @@
 						<string key="NS.object.0">FileOutlineView</string>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
+						<reference key="majorKey" ref="376310149"/>
 						<string key="minorKey">macosx/FileOutlineController.h</string>
 					</object>
 				</object>
@@ -1611,7 +1611,7 @@
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="268066477"/>
+						<reference key="majorKey" ref="376310149"/>
 						<string key="minorKey">macosx/NSApplicationAdditions.h</string>
 					</object>
 				</object>
@@ -1626,15 +1626,15 @@ AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxEBawALAAwAMQA1ADYAPAA9
 AEIAXABdAF4AXwBgAGEACwBuAIAAkACZAJoAmwCcAJ0AngCfAKMApACzALgAuQC6AL0AwADGAM8A0ADd
 AN4A5gDnAOoA9AD1APYA+wD9AQIBAwEGAQoBDQEVARYBHwEgASUBLgEvAUIBQwFIAUsBTAFPAVMBVgFZ
 AWEBYgFpAWoBdAF9AX4BggGKAYsBkwGUAZ0BngGoAakBrQGuAbEBugG7AcQBxQHIAckB0QHSAdoB2wHc
-AeQB5QH9AhcCHAIgAiECJQImAicCKQIqAi8COQImAjoCPgJAAkQCRwJPAlACVwJYAnACeAKHAosCqwKs
-Aq0CrgK2AsACwQLEAsoCywLOAtQC5gLnAu4C8QL2AvcC+gMCAwMDCAMJAwwDEwMUAxoDGwMgAyEDJAMt
-AzEDNwM4Az4DPwNHA0wDTQNQA1MDVANXA2EDYgNjA2YDcQNyA3YDdwN4A3sDgwOEA44DjwGtA5MDmwOc
-A6QDpQALA6YDqAOpA6oDrQPDA8sDzAPQA9UD1gPbA9wD4QPiA+cD6APrA/AD8QP2A/cD/AP9BAIEBQQG
-BAcEDAQNBBIEEwQYBBkEHgQfBCQEJQQqBC8EMAQ1BDYEOwQ8BEEEQgRzBHYEdwR5BKoE3AUOBQ8FEAUR
-BRIFEwUUBRUFFgUXBRgFGQUaBRsFHAUdBR4FHwUgBSEFIgUjBSQFJQUmBScFKAUpBSoFKwUsBS0FLgUv
-BTAFMQUyBTMFNAU1BTYFNwU4BTkFOgU7BTwFQAVEBYkFzgXPASQF0AXRAPEF0gXTAmUF1AXVBdYF1wXY
-BdkF2gXbBdwF3QXeALACpwXfBeAF4QXiBeMF5AXlBeYF5wXoBekF6gXrBewF7QBYBe4F7wXwBfEBOQXy
-An8F8wX0BfUF9gX3BfgF+QX6BfsF/AX9Bf4F/wYABgEGAgBZAPkGAwYEAjgGBQYIBgsGDlUkbnVsbN8Q
+AeQB5QH9AhcCHAIgAiECJQImAicCKQIqAi8COQImAjoCPgJAAkQCRwJPAlACVwJYAnACeAKHAosCqgKr
+AqwCrQK1Ar8CwALDAskCygLNAtMC5QLmAu0C8AL1AvYC+QMBAwIDBwMIAwsDEgMTAxkDGgMfAyADIwMs
+AzADNgM3Az0DPgNGA0sDTANPA1IDUwNWA2ADYQNiA2UDcANxA3UDdgN3A3oDggODA40DjgGtA5IDmgOb
+A6MDpAALA6UDpwOoA6kDrAPCA8oDywPPA9QD1QPYA90D3gPjA+YD5wPoA+0D7gPzA/QD+QP6A/8EAAQF
+BAYECwQMBBEEEgQXBBgEHQQeBCMEJAQpBCoELwQwBDUEOgQ7BEAEQQRyBHUEdgR4BKkE2wUNBQ4FDwUQ
+BREFEgUTBRQFFQUWBRcFGAUZBRoFGwUcBR0FHgUfBSAFIQUiBSMFJAUlBSYFJwUoBSkFKgUrBSwFLQUu
+BS8FMAUxBTIFMwU0BTUFNgU3BTgFOQU6BTsFPwVDBYgFzQDxAjgFzgXPAmUF0AXRBdIF0wXUBdUBJACw
+BdYF1wXYAFgF2QXaBdsF3AXdBd4F3wXgBeEF4gXjBeQF5QE5BeYF5wXoBekAWQXqBesF7AXtBe4F7wXw
+BfEF8gXzAPkF9AX1BfYF9wX4BfkF+gX7BfwF/QX+An8F/wYABgEGAgYDBgQGBQYIBgsGDlUkbnVsbN8Q
 EgANAA4ADwAQABEAEgATABQAFQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAiACMAJAAlACYAJwAoACkA
 KgArACwALQAuAC8AMFZOU1Jvb3RWJGNsYXNzXU5TT2JqZWN0c0tleXNfEA9OU0NsYXNzZXNWYWx1ZXNf
 EBlOU0FjY2Vzc2liaWxpdHlPaWRzVmFsdWVzXU5TQ29ubmVjdGlvbnNbTlNOYW1lc0tleXNbTlNGcmFt
@@ -1648,7 +1648,7 @@ gBihAEGAB90AQwAOAEQARQBGAEcASABJAEoASwBMAE0ATgBPAFAAUQBSAFMAVABVAFYAVwBYAFkAWgAr
 XE5TV2luZG93Vmlld18QFk5TV2luZG93Q29udGVudE1heFNpemVcTlNTY3JlZW5SZWN0XU5TV2luZG93
 VGl0bGVZTlNXVEZsYWdzXU5TV2luZG93Q2xhc3NfEBZOU1dpbmRvd0NvbnRlbnRNaW5TaXplXE5TV2lu
 ZG93UmVjdF8QD05TV2luZG93QmFja2luZ18QEU5TV2luZG93U3R5bGVNYXNrWU5TTWluU2l6ZVtOU1Zp
-ZXdDbGFzc4ANgMGAC4C/gAkSIAAAAIAKgAyACBACEA2AwIAAXxAYe3sxODYsIDQxOH0sIHs0MTQsIDQ5
+ZXdDbGFzc4ANgMGAC4C/gAkSIAAAAIAKgAyACBACEA+AwIAAXxAYe3sxODYsIDQxOH0sIHs0MTQsIDQ5
 M319VldpbmRvd1hOU1dpbmRvd157MTAwMDAsIDEwMDAwfVp7MzUwLCAzMDB91wBiAA4AYwBkAGUAXgBm
 AGcAaABpAGoAawBnAG1fEA9OU05leHRSZXNwb25kZXJaTlNTdWJ2aWV3c1hOU3ZGbGFnc1tOU0ZyYW1l
 U2l6ZVtOU1N1cGVydmlld4AOgL6ADxEBAIC8gA6AvdIADgA+AG8AcIBwrxAPAHEAcgBzAHQAdQB2AHcA
@@ -1726,112 +1726,112 @@ bnRlbnRWaWV3gA2ArICxgLAQEoCEgIGAeU8QEEEgAABBIAAAQhAAAEIQAAARARKADoANgKiAeoB60gAO
 AD4AbwJygHClAm4CbQJiAmcCZoB6gKiArICBgITbAGIADgCBAnkAYwBkAnoAXgJ7AGYCXwB9An0CfgJ/
 AoACgQKCAGcChAB9AoJZTlNjdkZsYWdzWU5TRG9jVmlld1lOU0JHQ29sb3KAeICngKYQBIB7EQkAgHyA
 DoCRgHiAfNIADgA+AG8CiYBwoQKCgHzfEBYAYgKMAA4CjQKOAo8A0QKQAlsCkQKSApMAZABlAIUAXgAy
-ApQClQBmApYClwJuAK4CmQKaApsCnAKdAIkCZgKgALACoQBqAqIAiQBnAqUCpgKnAm4CqQKqXxAfTlNE
+ApQClQBmApYClwJuAK4CmQKaApsCnAKdAIkCZgKgALACoQBqAqIAiQBnAqUCpgBZAm4CqAKpXxAfTlNE
 cmFnZ2luZ1NvdXJjZU1hc2tGb3JOb25Mb2NhbFlOU1R2RmxhZ3NfEBNOU09yaWdpbmFsQ2xhc3NOYW1l
 XE5TSGVhZGVyVmlld18QEk5TQWxsb3dzVHlwZVNlbGVjdF8QF05TSW50ZXJjZWxsU3BhY2luZ1dpZHRo
 XxAZTlNDb2x1bW5BdXRvcmVzaXppbmdTdHlsZV8QGE5TSW50ZXJjZWxsU3BhY2luZ0hlaWdodFtOU0dy
 aWRDb2xvcl8QHE5TRHJhZ2dpbmdTb3VyY2VNYXNrRm9yTG9jYWxeTlNUYWJsZUNvbHVtbnNbTlNSb3dI
-ZWlnaHSAeoClEhpAgACAfoCAgJoJgIQjQAgAAAAAAAAjQAAAAAAAAACAfwmADoB9gKIQD4B6gIcjQEEA
-AAAAAABfEA9GaWxlT3V0bGluZVZpZXddTlNPdXRsaW5lVmlld1p7MzU3LCAyNDZ91wBiAA4AZABlAF4A
-ZgKvAmcCsQBqArIAZwJnAoJbTlNUYWJsZVZpZXeAgYCDgIKADoCBgHzbAGIADgCBAnkAYwBkAnoAXgJ7
-AGYCXwB9An0CuQJ/AroCgQKcAGcChAB9ApyAeICngK+AroCAgA6AkYB4gIBZezM1NywgMTd90gA3ADgC
-wgLDpALDAMQAxQA7XxARTlNUYWJsZUhlYWRlclZpZXfWAGIADgCBAGQAXgBmAH0CxgLHAGoAZwB9gHiA
-hoCFgA6AeF8QFHt7MzU4LCAwfSwgezE2LCAxN3190gA3ADgCzALNpALNAMQAxQA7XV9OU0Nvcm5lclZp
-ZXfSAA4APgBvAtCAcKMC0QLSAtOAiICUgJ3aAtUADgLWAtcC2ALZAtoC2wLcAq8AiQLeAt8C4ALhAuIA
-sALjAuQCgl5OU0lzUmVzaXplYWJsZVxOU0hlYWRlckNlbGxcTlNJZGVudGlmaWVyV05TV2lkdGhaTlNE
-YXRhQ2VsbF5OU1Jlc2l6aW5nTWFza1pOU01pbldpZHRoWk5TTWF4V2lkdGgJgJOAioCJI0ByeZYAAAAA
-gI8jQENMsAAAAAAjQI9AAAAAAACAfFROYW1l1wClAA4A0QCnANIAqgDUAugC6QLqAuABPQCuAu0SBIH+
-AICOgIuAiYA7gIzTAA4A7AD3AO8A+QLwgCxLMC4zMzMzMzI5OQDVAA4A6wDsAO0A7gDvAP8A8QL0APOA
-LIAvgI2AKV8QD2hlYWRlclRleHRDb2xvctIANwA4AvgC+aUC+QEIAQkAgwA7XxARTlNUYWJsZUhlYWRl
-ckNlbGzYAKUADgDRAKcA0gDTAKoA1AL7ANYChAL+ANkCggH6ANwSVCH+QIAwgJGAkIAlgHyALVlUZXh0
-IENlbGzVAA4A6wDsAO0A7gDvAPAA8QMGAPOALIArgJKAKV8QFmNvbnRyb2xCYWNrZ3JvdW5kQ29sb3LS
-ADcAOAMKAwuiAwsAO11OU1RhYmxlQ29sdW1u2AAOAtYC1wLYAtkC2wLcAq8C3gMOAw8BIgMQAxEC5AKC
-gJOAloCVgJsjQCQAAAAAAACAfFVDaGVja9cApQAOANEApwDSAKoA1ADVAukDFgMXAT0ArgLtgI6AmICX
-gDuAjFJETNUADgDrAOwA7QDuAO8CnQDxAx4A84AsgJqAmYApW2hlYWRlckNvbG9y0wAOAOwA9wDvAPkD
-I4AsQjEA3QClAA4BMAExATIBMwE0AKcA0gDTATUAqgE2ANUBNwE4AfEAWAGiATgBOAMqAoIB+QMsAaeA
-QIA9gFKAPYA9gJyAfBIJAAAA1AAOAN8A4ADhAOIDLwDkASSAJyNAKAAAAAAAAIAm2AAOAtYC1wLYAtkC
-2wLcAq8C3gMzAzQCqgM1AxEC5AKCgJOAn4CegKGAfFhQcmlvcml0edcApQAOANEApwDSAKoA1ADVAukD
-FgM7AT0ArgLtgI6AmICggDuAjFRSYW5r2AClAA4A0QCnANIA0wCqANQC+wDWAoQC/gDZAoIDRQDcgDCA
-kYCQgCWAfBIIAAgAgC3VAA4A6wDsAO0A7gDvA0kA8QNKAPOALICkgKOAKVlncmlkQ29sb3LTAA4A7AD3
-AO8A+QNPgCxEMC41ANIANwA4A1EDUqIDUgA7Xk5TQ2xhc3NTd2FwcGVyXxAVe3sxLCAxN30sIHszNTcs
-IDI0Nn190gA3ADgDVQNWpANWAMQAxQA7Wk5TQ2xpcFZpZXfZAGIB/gAOAIEAZABeAgcAZgNYAH0AfQNb
-A1wAagBnA14AfQNgWU5TUGVyY2VudIB4gHiAq4CpgA6AqoB4Iz/scccgAAAAXxAWe3szNTgsIDE3fSwg
-ezE1LCAyNDZ9fVxfZG9TY3JvbGxlcjrSADcAOANkA2WlA2UAwwDEAMUAO1pOU1Njcm9sbGVy2gBiAf4A
-DgCBAloAZABeAgcAZgNYAH0AfQNbA2oDawNsAGcDXgB9A3CAeIB4gKuArREBARP/////gAABAIAOgKqA
-eCM/7oL54AAAAF8QGXt7LTEwMCwgLTEwMH0sIHszMjgsIDE1fX3SAA4APgBvA3SAcKECnICAXxATe3sx
-LCAwfSwgezM1NywgMTd9fV8QF3t7MjAsIDEwN30sIHszNzQsIDI2NH190gA3ADgDeQN6pAN6AMQAxQA7
-XE5TU2Nyb2xsVmlld9gAYgAOAIEAgwBkAIUAXgBmAE8BJwN+A38BmQCJAGcAT4ANgEGAs4C0CYAOgA1f
-EBV7ezE4LCA0MH0sIHsxMjksIDE4fX3eAKUADgEwA4UBMQEyATMBNACnANIA0wE1AKoBNgGfATcBOAOI
-ATkAWAGiATgDiwDZAH4BPwCuAaddTlNOb3JtYWxJbWFnZYBAgD2AtoBSgD2AtYAlgLJfEBJUcmFzaCB0
-b3JyZW50IGZpbGXTAA4AMgC0ALUAtgOSgB6AHIC32ABiAA4AgQCDAGQAhQBeAGYATwEnA5YDlwGZAIkA
-ZwBPgA2AQYC5gLoJgA6ADV8QFXt7MTQsIDY0fSwgezE0NiwgMzJ9fdwApQAOATABMQEyATQApwDSANMB
-NQCqATYA1QE3ATgBOQOfATgDoQDZAH8BPwHDAUGAQIA9EIGAPYC7gCWAuF8QEVZlcmlmeSBMb2NhbCBE
-YXRhWns0MTQsIDQ5M33SADcAOAOnAMSjAMQAxQA7XxAWe3swLCAwfSwgezE2ODAsIDEwMjh9fVp7MzUw
-LCAzMjJ90gA3ADgDqwOsogOsADtfEBBOU1dpbmRvd1RlbXBsYXRl0gAOAD4AbwOvgHCvEBMDsAOxA7ID
-swO0A7UDtgO3A7gDuQO6A7sDvAO9A74DvwPAA8EDwoDDgMaAyIDKgMyAz4DRgNOA1YDZgNuA3YDfgOGA
-44DkgOaA6IDq1AAOA8QDxQPGA8cAQQAfA8pdTlNEZXN0aW5hdGlvblhOU1NvdXJjZVdOU0xhYmVsgMWA
-B4ACgMRWd2luZG930gA3ADgDzQPOowPOA88AO18QFE5TTmliT3V0bGV0Q29ubmVjdG9yXk5TTmliQ29u
-bmVjdG9y1AAOA8QDxQPGA8cAcwAfA9SAxYAygAKAx1pmTmFtZUZpZWxk1AAOA8QDxQPGA8cAcQAfA9qA
-xYAQgAKAyVlmSWNvblZpZXfUAA4DxAPFA8YDxwB7AB8D4IDFgGCAAoDLW2ZHcm91cFBvcFVw1AAOA8QD
-xQPGA+MAHwB5A+aAzoACgFWAzVRhZGQ60gA3ADgD6QPqowPqA88AO18QFU5TTmliQ29udHJvbENvbm5l
-Y3RvctQADgPEA8UDxgPjAB8AdAPvgM6AAoA3gNBfEA9zZXREZXN0aW5hdGlvbjrUAA4DxAPFA8YDxwB+
-AB8D9YDFgLKAAoDSXGZEZWxldGVDaGVja9QADgPEA8UDxgPHAHcAHwP7gMWASoACgNReZkxvY2F0aW9u
-RmllbGTUAA4DxAPFA8YDxwP/AB8EAYDFgNaAAoDY0gAOADIAMwQEgASA118QFUZpbGVPdXRsaW5lQ29u
-dHJvbGxlcl8QD2ZGaWxlQ29udHJvbGxlctQADgPEA8UDxgPHAB8AQQQLgMWAAoAHgNpYZGVsZWdhdGXU
-AA4DxAPFA8YD4wAfAHoEEYDOgAKAW4DcWmNhbmNlbEFkZDrUAA4DxAPFA8YDxwB2AB8EF4DFgEaAAoDe
-XxASZkxvY2F0aW9uSW1hZ2VWaWV31AAOA8QDxQPGA+MAHwIuBB2AzoACgG2A4F8QEXNob3dHcm91cHNX
-aW5kb3c61AAOA8QDxQPGA8cD/wKCBCOAxYDWgHyA4lpkYXRhU291cmNl1AAOA8QDxQPGA8cD/wKCBAuA
-xYDWgHyA2tQADgPEA8UDxgPHAHgAHwQugMWAToACgOVbZlN0YXJ0Q2hlY2vUAA4DxAPFA8YD4wAfAH8E
-NIDOgAKAuIDnXxAQdmVyaWZ5TG9jYWxEYXRhOtQADgPEA8UDxgPHAoID/wQ6gMWAfIDWgOlYZk91dGxp
-bmXUAA4DxAPFA8YDxwByAB8EQIDFgCGAAoDrXGZTdGF0dXNGaWVsZNIADgA+BEMERIDvrxAuAm0AfQEp
-AHcCYgHgAi4DNQBPA38AcwERAHYAcgGYAHoBzQB+AIoAeQB1AMoB+wMQAtEAfwB4AEEBXQJLApwBtQB7
-A/8B9QKCAtIAdALiAYYAcQB8AtMDlwFvBHKAqIB4gDmASoCsgGKAbYChgA2AtIAygDSARoAhgFCAW4Bd
-gLKAGoBVgEKAI4BkgJuAiIC4gE6AB4BEgHaAgIBXgGCA1oBjgHyAlIA3gI+ATIAQgHSAnYC6gEmA7dIA
-DgAyADMEdYAEgO5dTlNBcHBsaWNhdGlvbtIANwA4BHgCPaICPQA70gAOAD4EQwR7gO+vEC4AfQBPAHQA
-TwB9AHsB+wLTAEEAfgBPAHMATwBPAHgATwB6AE8AcQBPAE8AcgHgAtICggBPAE8AHwB1AHwAfQB5AE8A
-HwH7AH0CggBPAtEAdwBPAE8CggB/AHYAH4B4gA2AN4ANgHiAYIBkgJ2AB4CygA2AMoANgA2AToANgFuA
-DYAQgA2ADYAhgGKAlIB8gA2ADYACgEKAdIB4gFWADYACgGSAeIB8gA2AiIBKgA2ADYB8gLiARoAC0gAO
-AD4EQwSsgO+vEC8CbQB9AHcCYgEpAeACLgM1AE8DfwAfAHMBEQB2AHIAfgB6Ac0BmACKAHkAdQB/AMoC
-0QH7AxAAeABBAV0CnAJLAHsD/wG1AfUCggLSAHQC4gGGAHEAfAOXAtMBbwRygKiAeIBKgKyAOYBigG2A
-oYANgLSAAoAygDSARoAhgLKAW4BdgFCAGoBVgEKAuIAjgIiAZICbgE6AB4BEgICAdoBggNaAV4BjgHyA
-lIA3gI+ATIAQgHSAuoCdgEmA7dIADgA+BEME3oDvrxAvBN8E4AThBOIE4wTkBOUE5gTnBOgE6QTqBOsE
-7ATtBO4E7wTwBPEE8gTzBPQE9QT2BPcE+AT5BPoAUwT8BP0E/gT/BQAFAQUCBQMFBAUFBQYFBwUIBQkF
-CgULBQwFDYDzgPSA9YD2gPeA+ID5gPqA+4D8gP2A/oD/gQEAgQEBgQECgQEDgQEEgQEFgQEGgQEHgQEI
-gQEJgQEKgQELgQEMgQENgQEOgAmBAQ+BARCBARGBARKBAROBARSBARWBARaBAReBARiBARmBARqBARuB
-ARyBAR2BAR6BAR+BASBfEBFWZXJ0aWNhbCBTY3JvbGxlcltTY3JvbGwgVmlld18QF1N0YXRpYyBUZXh0
-IChGaWxlCkZpbGUpXxATSG9yaXpvbnRhbCBTY3JvbGxlcl8QF0J1dHRvbiBDZWxsIChDaGFuZ2UuLi4p
-XxASUG9wIFVwIEJ1dHRvbiBDZWxsbxAYAE0AZQBuAHUAIABJAHQAZQBtACAAKABTAGgAbwB3ACAARwBy
-AG8AdQBwAHMgJgApXxAdVGV4dCBGaWVsZCBDZWxsIChUZXh0IENlbGwpLTFcQ29udGVudCBWaWV3XxAg
-QnV0dG9uIENlbGwgKFRyYXNoIHRvcnJlbnQgZmlsZSlcRmlsZSdzIE93bmVyXxAXU3RhdGljIFRleHQg
-KEZpbGUgTmFtZSlfEBtUZXh0IEZpZWxkIENlbGwgKEZpbGUgTmFtZSlfEB5JbWFnZSBWaWV3IChOU0Fw
-cGxpY2F0aW9uSWNvbilfEBlTdGF0aWMgVGV4dCAoc3RhdHVzIGluZm8pXxAeQ2hlY2sgQm94IChUcmFz
-aCB0b3JyZW50IGZpbGUpXxAUUHVzaCBCdXR0b24gKENhbmNlbClfEBRCdXR0b24gQ2VsbCAoQ2FuY2Vs
-KV8QHkJ1dHRvbiBDZWxsIChTdGFydCB3aGVuIGFkZGVkKV8QIEltYWdlIENlbGwgKE5TQXBwbGljYXRp
-b25JY29uKS0xXxARUHVzaCBCdXR0b24gKEFkZClfEBpTdGF0aWMgVGV4dCAoRG93bmxvYWQgdG86KV8Q
-H1B1c2ggQnV0dG9uIChWZXJpZnkgTG9jYWwgRGF0YSlfEB1UZXh0IEZpZWxkIENlbGwgKHN0YXR1cyBp
-bmZvKV8QE1RhYmxlIENvbHVtbiAoTmFtZSlfEBFNZW51IChPdGhlclZpZXdzKVtCdXR0b24gQ2VsbF8Q
-HENoZWNrIEJveCAoU3RhcnQgd2hlbiBhZGRlZClfEB5UZXh0IEZpZWxkIENlbGwgKERvd25sb2FkIHRv
-OilfEBFUYWJsZSBIZWFkZXIgVmlld18QGFRleHQgRmllbGQgQ2VsbCAoR3JvdXA6KVxQb3B1cCBCdXR0
-b25fEBdGaWxlIE91dGxpbmUgQ29udHJvbGxlcl8QEUJ1dHRvbiBDZWxsIChBZGQpWVNlcGFyYXRvcl8Q
-IkZpbGUgT3V0bGluZSBWaWV3IChOYW1lLCBETCwgUmFuaylfEBRUYWJsZSBDb2x1bW4gKENoZWNrKV8Q
-F1B1c2ggQnV0dG9uIChDaGFuZ2UuLi4pXxAbVGV4dCBGaWVsZCBDZWxsIChUZXh0IENlbGwpXxAbVGV4
-dCBGaWVsZCBDZWxsIChGaWxlCkZpbGUpXxAgSW1hZ2UgVmlldyAoTlNBcHBsaWNhdGlvbkljb24pLTFf
-EBRTdGF0aWMgVGV4dCAoR3JvdXA6KV8QH0J1dHRvbiBDZWxsIChWZXJpZnkgTG9jYWwgRGF0YSlfEBdU
-YWJsZSBDb2x1bW4gKFByaW9yaXR5KV8QHkltYWdlIENlbGwgKE5TQXBwbGljYXRpb25JY29uKVtBcHBs
-aWNhdGlvbtIADgA+BEMFPoDvoQKCgHzSAA4APgRDBUKA76ECpYB90gAOAD4EQwVGgO+vEEICbQB9ASkC
-LgAfAREAdgHNAZgAegB+A8EDwgB5AHUAygMQAtEDvQB4AEEBXQP/AfUCggLSAHQC4gO1A5cC0wO6A78C
-YgB3AeADNQBPA38DsAOzAHMDtwO5AHIDvAPAA7EDuwCKAH8B+wO2A7gCSwKcAbUAewOyA7QDvgGGAHEA
-fAFvBHKAqIB4gDmAbYACgDSARoBdgFCAW4CygOiA6oBVgEKAI4CbgIiA4YBOgAeARIDWgGOAfICUgDeA
-j4DPgLqAnYDbgOSArIBKgGKAoYANgLSAw4DKgDKA04DZgCGA34DmgMaA3YAagLiAZIDRgNWAdoCAgFeA
-YIDIgMyA44BMgBCAdIBJgO3SAA4APgRDBYuA768QQgWMBY0FjgWPBZAFkQWSBZMFlAWVBZYFlwWYBZkF
+ZWlnaHSAeoClEhpAgACAfoCAgJoJgIQjQAgAAAAAAAAjQAAAAAAAAACAfwmADoB9gKKAeoCHI0BBAAAA
+AAAAXxAPRmlsZU91dGxpbmVWaWV3XU5TT3V0bGluZVZpZXdaezM1NywgMjQ2fdcAYgAOAGQAZQBeAGYC
+rgJnArAAagKxAGcCZwKCW05TVGFibGVWaWV3gIGAg4CCgA6AgYB82wBiAA4AgQJ5AGMAZAJ6AF4CewBm
+Al8AfQJ9ArgCfwK5AoECnABnAoQAfQKcgHiAp4CvgK6AgIAOgJGAeICAWXszNTcsIDE3fdIANwA4AsEC
+wqQCwgDEAMUAO18QEU5TVGFibGVIZWFkZXJWaWV31gBiAA4AgQBkAF4AZgB9AsUCxgBqAGcAfYB4gIaA
+hYAOgHhfEBR7ezM1OCwgMH0sIHsxNiwgMTd9fdIANwA4AssCzKQCzADEAMUAO11fTlNDb3JuZXJWaWV3
+0gAOAD4AbwLPgHCjAtAC0QLSgIiAlICd2gLUAA4C1QLWAtcC2ALZAtoC2wKuAIkC3QLeAt8C4ALhALAC
+4gLjAoJeTlNJc1Jlc2l6ZWFibGVcTlNIZWFkZXJDZWxsXE5TSWRlbnRpZmllcldOU1dpZHRoWk5TRGF0
+YUNlbGxeTlNSZXNpemluZ01hc2taTlNNaW5XaWR0aFpOU01heFdpZHRoCYCTgIqAiSNAcnmWAAAAAICP
+I0BDTLAAAAAAI0CPQAAAAAAAgHxUTmFtZdcApQAOANEApwDSAKoA1ALnAugC6QLfAT0ArgLsEgSB/gCA
+joCLgImAO4CM0wAOAOwA9wDvAPkC74AsSzAuMzMzMzMyOTkA1QAOAOsA7ADtAO4A7wD/APEC8wDzgCyA
+L4CNgClfEA9oZWFkZXJUZXh0Q29sb3LSADcAOAL3AvilAvgBCAEJAIMAO18QEU5TVGFibGVIZWFkZXJD
+ZWxs2AClAA4A0QCnANIA0wCqANQC+gDWAoQC/QDZAoIB+gDcEhQh/kCAMICRgJCAJYB8gC1ZVGV4dCBD
+ZWxs1QAOAOsA7ADtAO4A7wDwAPEDBQDzgCyAK4CSgClfEBZjb250cm9sQmFja2dyb3VuZENvbG9y0gA3
+ADgDCQMKogMKADtdTlNUYWJsZUNvbHVtbtgADgLVAtYC1wLYAtoC2wKuAt0DDQMOASIDDwMQAuMCgoCT
+gJaAlYCbI0AkAAAAAAAAgHxVQ2hlY2vXAKUADgDRAKcA0gCqANQA1QLoAxUDFgE9AK4C7ICOgJiAl4A7
+gIxSREzVAA4A6wDsAO0A7gDvAp0A8QMdAPOALICagJmAKVtoZWFkZXJDb2xvctMADgDsAPcA7wD5AyKA
+LEIxAN0ApQAOATABMQEyATMBNACnANIA0wE1AKoBNgDVATcBOAHxAFgBogE4ATgDKQKCAfkDKwGngECA
+PYBSgD2APYCcgHwSCQAAANQADgDfAOAA4QDiAy4A5AEkgCcjQCgAAAAAAACAJtgADgLVAtYC1wLYAtoC
+2wKuAt0DMgMzAqkDNAMQAuMCgoCTgJ+AnoChgHxYUHJpb3JpdHnXAKUADgDRAKcA0gCqANQA1QLoAxUD
+OgE9AK4C7ICOgJiAoIA7gIxUUmFua9gApQAOANEApwDSANMAqgDUAvoA1gKEAv0A2QKCA0QA3IAwgJGA
+kIAlgHwSCAAIAIAt1QAOAOsA7ADtAO4A7wNIAPEDSQDzgCyApICjgClZZ3JpZENvbG9y0wAOAOwA9wDv
+APkDToAsRDAuNQDSADcAOANQA1GiA1EAO15OU0NsYXNzU3dhcHBlcl8QFXt7MSwgMTd9LCB7MzU3LCAy
+NDZ9fdIANwA4A1QDVaQDVQDEAMUAO1pOU0NsaXBWaWV32QBiAf4ADgCBAGQAXgIHAGYDVwB9AH0DWgNb
+AGoAZwNdAH0DX1lOU1BlcmNlbnSAeIB4gKuAqYAOgKqAeCM/7HHHIAAAAF8QFnt7MzU4LCAxN30sIHsx
+NSwgMjQ2fX1cX2RvU2Nyb2xsZXI60gA3ADgDYwNkpQNkAMMAxADFADtaTlNTY3JvbGxlctoAYgH+AA4A
+gQJaAGQAXgIHAGYDVwB9AH0DWgNpA2oDawBnA10AfQNvgHiAeICrgK0RAQET/////4AAAQCADoCqgHgj
+P+6C+eAAAABfEBl7ey0xMDAsIC0xMDB9LCB7MzI4LCAxNX190gAOAD4AbwNzgHChApyAgF8QE3t7MSwg
+MH0sIHszNTcsIDE3fX1fEBd7ezIwLCAxMDd9LCB7Mzc0LCAyNjR9fdIANwA4A3gDeaQDeQDEAMUAO1xO
+U1Njcm9sbFZpZXfYAGIADgCBAIMAZACFAF4AZgBPAScDfQN+AZkAiQBnAE+ADYBBgLOAtAmADoANXxAV
+e3sxOCwgNDB9LCB7MTI5LCAxOH193gClAA4BMAOEATEBMgEzATQApwDSANMBNQCqATYBnwE3ATgDhwE5
+AFgBogE4A4oA2QB+AT8ArgGnXU5TTm9ybWFsSW1hZ2WAQIA9gLaAUoA9gLWAJYCyXxASVHJhc2ggdG9y
+cmVudCBmaWxl0wAOADIAtAC1ALYDkYAegByAt9gAYgAOAIEAgwBkAIUAXgBmAE8BJwOVA5YBmQCJAGcA
+T4ANgEGAuYC6CYAOgA1fEBV7ezE0LCA2NH0sIHsxNDYsIDMyfX3cAKUADgEwATEBMgE0AKcA0gDTATUA
+qgE2ANUBNwE4ATkDngE4A6AA2QB/AT8BwwFBgECAPRCBgD2Au4AlgLhfEBFWZXJpZnkgTG9jYWwgRGF0
+YVp7NDE0LCA0OTN90gA3ADgDpgDEowDEAMUAO18QFnt7MCwgMH0sIHsxNjgwLCAxMDI4fX1aezM1MCwg
+MzIyfdIANwA4A6oDq6IDqwA7XxAQTlNXaW5kb3dUZW1wbGF0ZdIADgA+AG8DroBwrxATA68DsAOxA7ID
+swO0A7UDtgO3A7gDuQO6A7sDvAO9A74DvwPAA8GAw4DGgMmAy4DPgNGA04DVgNeA2YDbgN2A34DhgOOA
+5YDngOiA6tQADgPDA8QDxQPGAB8AdAPJXU5TRGVzdGluYXRpb25YTlNTb3VyY2VXTlNMYWJlbIDFgAKA
+N4DEXxAPc2V0RGVzdGluYXRpb2460gA3ADgDzAPNowPNA84AO18QFU5TTmliQ29udHJvbENvbm5lY3Rv
+cl5OU05pYkNvbm5lY3RvctQADgPDA8QDxQPQAEEAHwPTgMiAB4ACgMdWd2luZG930gA3ADgD1gPXowPX
+A84AO18QFE5TTmliT3V0bGV0Q29ubmVjdG9y1AAOA8MDxAPFA8YAHwB/A9yAxYACgLiAyl8QEHZlcmlm
+eUxvY2FsRGF0YTrUAA4DwwPEA8UD0APgAoID4oDIgMyAfIDO0gAOADIAMwPlgASAzV8QFUZpbGVPdXRs
+aW5lQ29udHJvbGxlclpkYXRhU291cmNl1AAOA8MDxAPFA8YAHwB6A+yAxYACgFuA0FpjYW5jZWxBZGQ6
+1AAOA8MDxAPFA8YAHwIuA/KAxYACgG2A0l8QEXNob3dHcm91cHNXaW5kb3c61AAOA8MDxAPFA9AAcQAf
+A/iAyIAQgAKA1FlmSWNvblZpZXfUAA4DwwPEA8UD0AByAB8D/oDIgCGAAoDWXGZTdGF0dXNGaWVsZNQA
+DgPDA8QDxQPGAB8AeQQEgMWAAoBVgNhUYWRkOtQADgPDA8QDxQPQA+ACggQKgMiAzIB8gNpYZGVsZWdh
+dGXUAA4DwwPEA8UD0AB+AB8EEIDIgLKAAoDcXGZEZWxldGVDaGVja9QADgPDA8QDxQPQAHYAHwQWgMiA
+RoACgN5fEBJmTG9jYXRpb25JbWFnZVZpZXfUAA4DwwPEA8UD0ABzAB8EHIDIgDKAAoDgWmZOYW1lRmll
+bGTUAA4DwwPEA8UD0AB4AB8EIoDIgE6AAoDiW2ZTdGFydENoZWNr1AAOA8MDxAPFA9AAewAfBCiAyIBg
+gAKA5FtmR3JvdXBQb3BVcNQADgPDA8QDxQPQA+AAHwQugMiAzIACgOZfEA9mRmlsZUNvbnRyb2xsZXLU
+AA4DwwPEA8UD0AAfAEEECoDIgAKAB4Da1AAOA8MDxAPFA9AAdwAfBDmAyIBKgAKA6V5mTG9jYXRpb25G
+aWVsZNQADgPDA8QDxQPQAoID4AQ/gMiAfIDMgOtYZk91dGxpbmXSAA4APgRCBEOA768QLgB0AtIBEQRH
+AHgCggB9AV0DDwOWAZgCbQLQAHYBzQH1AHUCnAIuASkAQQG1AeADNAPgAE8AcQB8AtEBbwB7AHMAfgB6
+AfsAdwJLAuEAcgCKA34AfwDKAHkCYgGGgDeAnYA0gO2AToB8gHiARICbgLqAUICogIiARoBdgGOAQoCA
+gG2AOYAHgFeAYoChgMyADYAQgHSAlIBJgGCAMoCygFuAZIBKgHaAj4AhgBqAtIC4gCOAVYCsgEzSAA4A
+MgAzBHSABIDuXU5TQXBwbGljYXRpb27SADcAOAR3Aj2iAj0AO9IADgA+BEIEeoDvrxAuAE8CggBzAB8A
+TwB9AE8AdQLRAH8AeAB9AoIATwB6AfsATwB9AfsAdAAfAHkAewLSAB8AQQBPAE8CggB2AE8ATwBPAE8B
+4ABPAHwC0ABPAHEAfgBPAHIATwB9AHeADYB8gDKAAoANgHiADYBCgJSAuIBOgHiAfIANgFuAZIANgHiA
+ZIA3gAKAVYBggJ2AAoAHgA2ADYB8gEaADYANgA2ADYBigA2AdICIgA2AEICygA2AIYANgHiAStIADgA+
+BEIEq4DvrxAvAHQC0gERBEcAeAKCAH0BXQOWAw8BmAJtAtAAdgKcAc0AdQH1Ai4BKQBBA+AB4AG1AzQA
+TwBxAHwC0QFvAHsAcwB+AB8AegB3AksB+wByAIoAfwN+AHkCYgDKAYYC4YA3gJ2ANIDtgE6AfIB4gESA
+uoCbgFCAqICIgEaAgIBdgEKAY4BtgDmAB4DMgGKAV4ChgA2AEIB0gJSASYBggDKAsoACgFuASoB2gGSA
+IYAagLiAtIBVgKyAI4BMgI/SAA4APgRCBN2A768QLwTeBN8E4AThBOIE4wTkBOUE5gTnBOgE6QTqBOsE
+7ATtBO4E7wTwBPEAUwTzBPQE9QT2BPcE+AT5BPoE+wT8BP0E/gT/BQAFAQUCBQMFBAUFBQYFBwUIBQkF
+CgULBQyA84D0gPWA9oD3gPiA+YD6gPuA/ID9gP6A/4EBAIEBAYEBAoEBA4EBBIEBBYEBBoAJgQEHgQEI
+gQEJgQEKgQELgQEMgQENgQEOgQEPgQEQgQERgQESgQETgQEUgQEVgQEWgQEXgQEYgQEZgQEagQEbgQEc
+gQEdgQEegQEfgQEgXxAXUHVzaCBCdXR0b24gKENoYW5nZS4uLilfEBdUYWJsZSBDb2x1bW4gKFByaW9y
+aXR5KV8QG1RleHQgRmllbGQgQ2VsbCAoRmlsZSBOYW1lKVtBcHBsaWNhdGlvbl8QHENoZWNrIEJveCAo
+U3RhcnQgd2hlbiBhZGRlZClfECJGaWxlIE91dGxpbmUgVmlldyAoTmFtZSwgREwsIFJhbmspW1Njcm9s
+bCBWaWV3XxAeVGV4dCBGaWVsZCBDZWxsIChEb3dubG9hZCB0bzopXxAfQnV0dG9uIENlbGwgKFZlcmlm
+eSBMb2NhbCBEYXRhKVtCdXR0b24gQ2VsbF8QHkJ1dHRvbiBDZWxsIChTdGFydCB3aGVuIGFkZGVkKV8Q
+EVZlcnRpY2FsIFNjcm9sbGVyXxATVGFibGUgQ29sdW1uIChOYW1lKV8QHkltYWdlIFZpZXcgKE5TQXBw
+bGljYXRpb25JY29uKV8QEVRhYmxlIEhlYWRlciBWaWV3XxAUQnV0dG9uIENlbGwgKENhbmNlbClfEBpT
+dGF0aWMgVGV4dCAoRG93bmxvYWQgdG86KVlTZXBhcmF0b3JvEBgATQBlAG4AdQAgAEkAdABlAG0AIAAo
+AFMAaABvAHcAIABHAHIAbwB1AHAAcyAmAClfEBdCdXR0b24gQ2VsbCAoQ2hhbmdlLi4uKV8QF0ZpbGUg
+T3V0bGluZSBDb250cm9sbGVyXxASUG9wIFVwIEJ1dHRvbiBDZWxsXxARQnV0dG9uIENlbGwgKEFkZClf
+EBtUZXh0IEZpZWxkIENlbGwgKFRleHQgQ2VsbClcQ29udGVudCBWaWV3XxAgSW1hZ2UgVmlldyAoTlNB
+cHBsaWNhdGlvbkljb24pLTFfEBRTdGF0aWMgVGV4dCAoR3JvdXA6KV8QFFRhYmxlIENvbHVtbiAoQ2hl
+Y2spXxAeSW1hZ2UgQ2VsbCAoTlNBcHBsaWNhdGlvbkljb24pXFBvcHVwIEJ1dHRvbl8QF1N0YXRpYyBU
+ZXh0IChGaWxlIE5hbWUpXxAeQ2hlY2sgQm94IChUcmFzaCB0b3JyZW50IGZpbGUpXEZpbGUncyBPd25l
+cl8QFFB1c2ggQnV0dG9uIChDYW5jZWwpXxAXU3RhdGljIFRleHQgKEZpbGUKRmlsZSlfEBhUZXh0IEZp
+ZWxkIENlbGwgKEdyb3VwOilfEBFNZW51IChPdGhlclZpZXdzKV8QGVN0YXRpYyBUZXh0IChzdGF0dXMg
+aW5mbylfECBJbWFnZSBDZWxsIChOU0FwcGxpY2F0aW9uSWNvbiktMV8QH1B1c2ggQnV0dG9uIChWZXJp
+ZnkgTG9jYWwgRGF0YSlfECBCdXR0b24gQ2VsbCAoVHJhc2ggdG9ycmVudCBmaWxlKV8QEVB1c2ggQnV0
+dG9uIChBZGQpXxATSG9yaXpvbnRhbCBTY3JvbGxlcl8QHVRleHQgRmllbGQgQ2VsbCAoc3RhdHVzIGlu
+Zm8pXxAbVGV4dCBGaWVsZCBDZWxsIChGaWxlCkZpbGUpXxAdVGV4dCBGaWVsZCBDZWxsIChUZXh0IENl
+bGwpLTHSAA4APgRCBT2A76ECgoB80gAOAD4EQgVBgO+hAqWAfdIADgA+BEIFRYDvrxBCA7ABEQRHAoID
+vwGYAHYBzQH1AHUCnAO3ASkAQQG1AeAD4ABPA7sAfAFvAH4AdwO1A34AfwB5AmIDugO9A7kDwAB0AtIA
+eAB9AV0DDwOWAm0C0AOyAi4DwQO+AzQDuABxAtEDvAOzAHsDtgBzAB8AegH7AksC4QByA68AigDKA7ED
+tAGGgMaANIDtgHyA54BQgEaAXYBjgEKAgIDXgDmAB4BXgGKAzIANgN+AdIBJgLKASoDTgLSAuIBVgKyA
+3YDjgNuA6IA3gJ2AToB4gESAm4C6gKiAiIDLgG2A6oDlgKGA2YAQgJSA4YDPgGCA1YAygAKAW4BkgHaA
+j4AhgMOAGoAjgMmA0YBM0gAOAD4EQgWKgO+vEEIFiwWMBY0FjgWPBZAFkQWSBZMFlAWVBZYFlwWYBZkF
 mgWbBZwFnQWeBZ8FoAWhBaIFowWkBaUFpgWnBagFqQWqBasFrAWtBa4FrwWwBbEFsgWzBbQFtQW2BbcF
-uAW5BboFuwW8Bb0FvgW/BcAFwQXCBcMFxAXFBcYFxwXIBckFygXLBcwFzYEBJYEBJoEBJ4EBKIEBKYEB
-KoEBK4EBLIEBLYEBLoEBL4EBMIEBMYEBMoEBM4EBNIEBNYEBNoEBN4EBOIEBOYEBOoEBO4EBPIEBPYEB
-PoEBP4EBQIEBQYEBQoEBQ4EBRIEBRYEBRoEBR4EBSIEBSYEBSoEBS4EBTIEBTYEBToEBT4EBUIEBUYEB
-UoEBU4EBVIEBVYEBVoEBV4EBWIEBWYEBWoEBW4EBXIEBXYEBXoEBX4EBYIEBYYEBYoEBY4EBZIEBZYEB
-ZhAtECoQPhBEEAsQFhAVEDoQNhAYEBMQChAHEDMQMRA4EBEQNRA/EC4QMBAJEDIQHhBCEC8QIBAaECwQ
-DBAiEDQQOxAdECcQBRA9EEAQQxAXEBwQCBBBECMQPBA5ECkQKxAUECEQGxAfEDcQKBAO0gAOAD4AbwYH
-gHCg0gAOAD4EQwYKgO+g0gAOAD4EQwYNgO+g0gA3ADgGDwYQogYQADteTlNJQk9iamVjdERhdGEACAAZ
+uAW5BboFuwW8Bb0FvgW/BcAFwQXCBcMFxAXFBcYFxwXIBckFygXLBcyBASWBASaBASeBASiBASmBASqB
+ASuBASyBAS2BAS6BAS+BATCBATGBATKBATOBATSBATWBATaBATeBATiBATmBATqBATuBATyBAT2BAT6B
+AT+BAUCBAUGBAUKBAUOBAUSBAUWBAUaBAUeBAUiBAUmBAUqBAUuBAUyBAU2BAU6BAU+BAVCBAVGBAVKB
+AVOBAVSBAVWBAVaBAVeBAViBAVmBAVqBAVuBAVyBAV2BAV6BAV+BAWCBAWGBAWKBAWOBAWSBAWWBAWYQ
+HRAuED0QCxAWED8QChArEB8QFBAiEDUQFxAoEA4QOhAMEBsQOxBBEBMQLBAcECcQPBAJEC8QERAqEDMQ
+QhAtEDEQOBA+EDYQORA0EDcQMBAaECAQIRAYEAUQRBAVECMQKRAyEB4QCBAHEEMQQBAN0gAOAD4AbwYH
+gHCg0gAOAD4EQgYKgO+g0gAOAD4EQgYNgO+g0gA3ADgGDwYQogYQADteTlNJQk9iamVjdERhdGEACAAZ
 ACIAJwAxADoAPwBEAFIAVABmA0ADRgORA5gDnwOtA78D2wPpA/UEAQQPBBoEKAREBFIEZQR3BJEEmwSo
 BKoErQSvBLIEtQS3BLkEuwS+BMEEwwTGBMgEygTMBM8E0QTUBN0E6QTrBO0FAwUMBRUFIAUlBTQFPQVQ
 BVkFZAVmBWkFawWgBa0FxgXTBeEF6wX5BhIGHwYxBkUGTwZbBl0GXwZhBmMGZQZqBmwGbgZwBnIGdAZ2
@@ -1854,34 +1854,34 @@ FSQVJhUoFToVRxVJFUsVTRVgFXQVfRWCFY0VlhWYFZ0VnxWhFc4V0BXSFdQV1hXYFdoV3BXeFecWABYJ
 FhAWHxYnFjAWNRY+FksWXxZuFncWhBaSFrMWtRa3FrkWuxa8Fr4WwBbYFvkW+xb9Fv8XARcDFwUXDBdL
 F1cXYBdtF4AXjReZF6cXtRe3F7kXuxe9F78XwRfDF8UX2BfbF90X3xfhF+MX5RfuF/AX+xf9F/8YARgD
 GAUYMhg8GEYYUBhSGFQYVhhYGFoYXRhfGGEYYxhlGGcYcBhyGHUYdxjSGPQY/hkUGSEZNhlQGWwZhxmT
-GbIZwRnNGc8Z0RnWGdgZ2hncGd0Z3xnoGfEZ8xn0GfYZ+Bn6GfwZ/hoAGgkaGxopGjQaURpdGl8aYRpj
-GmUaZxppGpYamBqaGpwanhqgGqIapBqmGqgashq7GsQa2BrxGvMa9Rr3Gvka+xsSGxsbJBsyGzsbPRtE
-G0YbSBtKG3MbghuPG5wbpBuvG74byRvUG9Ub1xvZG9sb5BvmG+8b+Bv6G/8cHBwhHCMcJRwnHCkcKxw4
-HDocRhxbHF0cXxxhHGMcdRx+HIkcnRy+HMMcxRzHHMkcyxzNHM8c2RzuHPAc8hz0HPYdDx0YHR0dKx1M
-HU4dUB1SHVQdXR1fHWUdgh2EHYYdiB2KHYwdjx2kHaYdqB2qHawduB3FHccdyh3/HgEeAx4FHgceCR4L
-Hg0eEh4jHiUeLh4wHlEeUx5VHlceWR5bHmQegR6DHoUehx6JHosekB6xHrMetR63Hrkeux7AHsIe1x7Z
-Htse3R7fHuke9h74Hv0fBh8LHxofMh87H0QfTx90H34fgB+CH4Qfhh+IH4ofjB+VH64fux/EH88f2iAD
-IAUgByAJIAsgDiAXIBkgGyAdICYgQiBLIE0gUCBSIGgggiCLIJQgoSDCIMQgxiDIIMogyyDNIM8g5yEg
-IS4hMCEyITQhNiE4ITohPCE+IVMhYCFiIWQhZiGHIYkhiyGNIY8hkCGSIZQhrCHdId8h4SHjIeUh5yHp
-Iesh/yIKIhMiGiIzIj4iRyJMIl8iaCJqIpMilSKXIpkimyKdIp8ioSKjIqUipyKpIqsirSKvIrEisyK1
-IrciuSLKItgi4SLpIusi7SLvIvEi+CMBIwgjHyMuIz8jQSNDI0UjRyNSI2MjZSNnI2kjayN1I4YjiCOK
-I4wjjiOaI6sjrSOvI7EjsyO4I8EjyCPgI/Ej8yP1I/cj+SQLJBwkHiQgJCIkJCQxJEIkRCRGJEgkSiRZ
-JGokbCRuJHAkciR7JH0kfySXJKkkuiS8JL4kwCTCJMsk3CTeJOAk4iTkJO8lACUCJQQlBiUIJR0lLiUw
-JTIlNCU2JUolWyVdJV8lYSVjJW4lfyWBJYMlhSWHJZglmiWcJZ4loCWsJb0lvyXBJcMlxSXYJekl6yXt
-Je8l8SX6JgsmDSYPJhEmEyYgJikmKyaKJowmjiaQJpImlCaWJpgmmiacJp4moCaiJqQmpiaoJqomrCau
-JrAmsia0JrYmuCa6JrwmvibAJsImxCbGJsgmyibMJs4m0CbSJtQm1ibYJtom3CbeJuAm4ibkJuYm7ybx
-JvMnAScKJw8nGCcaJ3kneyd9J38ngSeDJ4UnhyeJJ4snjSePJ5EnkyeVJ5cnmSebJ50nnyehJ6MnpSen
-J6knqyetJ68nsSezJ7Untye5J7snvSe/J8EnwyfFJ8cnySfLJ80nzyfRJ9Mn1SfeJ+AoQShDKEUoRyhJ
+GbIZwRnNGc8Z0RnWGdgZ2hncGd0Z3xnoGfEZ8xn0GfYZ+Bn6GfwZ/hoHGhkaJxoyGk8aWxpdGl8aYRpj
+GmUaZxqUGpYamBqaGpwanhqgGqIapBqmGrAauRrCGtYa7xrxGvMa9Rr3GvkbEBsZGyIbMBs5GzsbQhtE
+G0YbSBtxG4AbjRuaG6IbrRu8G8cb0hvTG9Ub1xvZG+Ib5BvtG/Yb+Bv9HBocHxwhHCMcJRwnHCkcNhw4
+HEQcWRxbHF0cXxxhHHMcfByHHJscvBzBHMMcxRzHHMkcyxzNHNcc7BzuHPAc8hz0HQ0dFh0bHSkdSh1M
+HU4dUB1SHVsdXR1jHYAdgh2EHYYdiB2KHY0doh2kHaYdqB2qHbYdwx3FHcgd/R3/HgEeAx4FHgceCR4L
+HhAeIR4jHiweLh5PHlEeUx5VHlceWR5iHn8egR6DHoUehx6JHo4erx6xHrMetR63Hrkevh7AHtUe1x7Z
+Htse3R7nHvQe9h77HwQfCR8YHzAfOR9CH00fch98H34fgB+CH4Qfhh+IH4ofkx+sH7kfwh/NH9ggASAD
+IAUgByAJIAwgFSAXIBkgGyAkIEAgSSBLIE4gUCBmIIAgiSCSIJ8gwCDCIMQgxiDIIMkgyyDNIOUhHiEs
+IS4hMCEyITQhNiE4ITohPCFRIV4hYCFiIWQhhSGHIYkhiyGNIY4hkCGSIaoh2yHdId8h4SHjIeUh5yHp
+If0iCCIRIhgiMSI8IkUiSiJdImYiaCKRIpMilSKXIpkimyKdIp8ioSKjIqUipyKpIqsirSKvIrEisyK1
+IrciyCLWIt8i5yLpIusi7SLvIwEjCiMRIykjOCNJI0sjTSNPI1EjWCNhI2gjfyOQI5IjlCOWI5gjqyO8
+I74jwCPCI8QjzSPPI9Ej6SP0JAUkByQJJAskDSQYJCkkKyQtJC8kMSRFJFYkWCRaJFwkXiRoJHkkeyR9
+JH8kgSSOJJ8koSSjJKUkpySsJL0kvyTBJMMkxSTOJN8k4STjJOUk5yT0JQUlByUJJQslDSUiJTMlNSU3
+JTklOyVGJVclWSVbJV0lXyVrJXwlfiWAJYIlhCWQJaEloyWlJaclqSW7JcwlziXQJdIl1CXlJecl6SXr
+Je0l/CYNJg8mESYTJhUmHiYnJikmiCaKJowmjiaQJpImlCaWJpgmmiacJp4moCaiJqQmpiaoJqomrCau
+JrAmsia0JrYmuCa6JrwmvibAJsImxCbGJsgmyibMJs4m0CbSJtQm1ibYJtom3CbeJuAm4ibkJu0m7ybx
+Jv8nCCcNJxYnGCd3J3kneyd9J38ngSeDJ4UnhyeJJ4snjSePJ5EnkyeVJ5cnmSebJ50nnyehJ6MnpSen
+J6knqyetJ68nsSezJ7Untye5J7snvSe/J8EnwyfFJ8cnySfLJ80nzyfRJ9Mn3CfeKD8oQShDKEUoRyhJ
 KEsoTShPKFEoUyhVKFcoWShbKF0oXyhhKGMoZShnKGkoayhtKG8ocShzKHUodyh5KHsofSh/KIEogyiF
-KIcoiSiLKI0ojyiRKJMolSiXKJkomyidKJ8oqCiqKQspDSkPKREpEykVKRcpGSkbKR0pHykhKSMpJSko
-KSspLikxKTQpNyk6KT0pQClDKUYpSSlMKU8pUilUKVcpWildKWApYylmKWkpbClvKXIpdSl4KXspfimB
-KYQphymKKZ4pqinEKdop9CoJKjwqXCppKowqmSqzKtEq8isOKy8rRitdK34roSu1K9Ir9CwULCosPixK
-LGksiiyeLLksxizgLPQs/i0jLTotVC1yLZAtsy3KLewuBi4nLjMuPC4+LkEuQy5MLk4uUS5TLlwuXi7l
+KIcoiSiLKI0ojyiRKJMolSiXKJkomyidKKYoqCkJKQspDSkPKREpEykVKRcpGSkbKR0pHykhKSMpJikp
+KSwpLykyKTUpOCk6KT0pQClDKUYpSSlMKU8pUilVKVgpWyleKWEpZClnKWopbSlwKXMpdil5KXwpfymC
+KYUpiCmiKbwp2inmKgUqKio2KlcqeSqFKqYquirQKvErBSscKzkrQyt2K5Arqiu/K9Mr8Sv+LCEsOCxP
+LHAsfSyXLLgsxSzcLPYtES0lLUEtZC2GLaktvS3TLfMuES4xLjouPC4/LkEuSi5MLk8uUS5aLlwu4y7l
 Lucu6S7rLu0u7y7xLvMu9S73Lvku+y79Lv8vAS8DLwUvBy8JLwsvDS8PLxEvEy8VLxcvGS8bLx0vHy8h
 LyMvJS8nLykvKy8tLy8vMS8zLzUvNy85LzsvPS8/L0EvQy9FL0cvSS9LL00vTy9RL1MvVS9XL1kvWy9d
-L18vYS9jL2UvZy9pL3IvdC/7L/4wATAEMAcwCjANMBAwEzAWMBkwHDAfMCIwJTAoMCswLjAxMDQwNzA6
-MD0wQDBDMEYwSTBMME8wUjBVMFgwWzBeMGEwZDBnMGowbTBwMHMwdjB5MHwwfzCCMIUwiDCLMI4wkTCU
-MJcwmjCdMKAwozCmMKkwrDCvMLIwtTC4MLswvjDBMMMwxTDHMMkwyzDNMM8w0TDTMNUw1zDZMNsw3TDf
+L18vYS9jL2UvZy9wL3Iv+S/8L/8wAjAFMAgwCzAOMBEwFDAXMBowHTAgMCMwJjApMCwwLzAyMDUwODA7
+MD4wQTBEMEcwSjBNMFAwUzBWMFkwXDBfMGIwZTBoMGswbjBxMHQwdzB6MH0wgDCDMIYwiTCMMI8wkjCV
+MJgwmzCeMKEwpDCnMKowrTCwMLMwtjC5MLwwvzDBMMMwxTDHMMkwyzDNMM8w0TDTMNUw1zDZMNsw3TDf
 MOEw4zDlMOcw6TDrMO0w7zDxMPMw9TD3MPkw+zD9MP8xATEDMQUxBzEJMQsxDTEPMRExEzEVMRcxGTEb
 MR0xHzEhMSMxJTEnMSkxKzEtMS8xODE6MTsxRDFGMUcxUDFSMVMxXDFhAAAAAAAAAgIAAAAAAAAGEQAA
 AAAAAAAAAAAAAAAAMXA</bytes>
diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index f9167d194..b1881d611 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -474,7 +474,7 @@
     //icon
     if (!minimal || !(!fTracking && fHoverAction)) //don't show in minimal mode when hovered over
     {
-        NSImage * icon = minimal && error ? fErrorImage : [torrent icon];
+        NSImage * icon = (minimal && error) ? fErrorImage : [torrent icon];
         [icon drawInRect: iconRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
     }