From 4a7c4ac7e035a87c9c045872c21ab35a53be719e Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeracher@apple.com>
Date: Fri, 12 Aug 2011 22:51:58 +0200
Subject: [PATCH] Added AnnotationController

---
 Medianno/en.lproj/MADocument.xib | 629 +++++++++++++++++--------------
 1 file changed, 351 insertions(+), 278 deletions(-)

diff --git a/Medianno/en.lproj/MADocument.xib b/Medianno/en.lproj/MADocument.xib
index f278b8f..77422de 100644
--- a/Medianno/en.lproj/MADocument.xib
+++ b/Medianno/en.lproj/MADocument.xib
@@ -73,39 +73,39 @@
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSSplitView" id="535035241">
+						<object class="NSSplitView" id="240403983">
 							<reference key="NSNextResponder" ref="568628114"/>
 							<int key="NSvFlags">274</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSScrollView" id="734376697">
-									<reference key="NSNextResponder" ref="535035241"/>
+								<object class="NSScrollView" id="141262373">
+									<reference key="NSNextResponder" ref="240403983"/>
 									<int key="NSvFlags">292</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSClipView" id="199473590">
-											<reference key="NSNextResponder" ref="734376697"/>
+										<object class="NSClipView" id="735378444">
+											<reference key="NSNextResponder" ref="141262373"/>
 											<int key="NSvFlags">2304</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSTableView" id="883963765">
-													<reference key="NSNextResponder" ref="199473590"/>
+												<object class="NSTableView" id="677931807">
+													<reference key="NSNextResponder" ref="735378444"/>
 													<int key="NSvFlags">256</int>
 													<string key="NSFrameSize">{1279, 183}</string>
-													<reference key="NSSuperview" ref="199473590"/>
+													<reference key="NSSuperview" ref="735378444"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="1052203769"/>
+													<reference key="NSNextKeyView" ref="728081730"/>
 													<string key="NSReuseIdentifierKey">_NS:1197</string>
 													<bool key="NSEnabled">YES</bool>
-													<object class="NSTableHeaderView" key="NSHeaderView" id="426832557">
-														<reference key="NSNextResponder" ref="358070184"/>
+													<object class="NSTableHeaderView" key="NSHeaderView" id="10263050">
+														<reference key="NSNextResponder" ref="950826239"/>
 														<int key="NSvFlags">256</int>
 														<string key="NSFrameSize">{1279, 17}</string>
-														<reference key="NSSuperview" ref="358070184"/>
+														<reference key="NSSuperview" ref="950826239"/>
 														<reference key="NSWindow"/>
-														<reference key="NSNextKeyView" ref="199473590"/>
+														<reference key="NSNextKeyView" ref="735378444"/>
 														<string key="NSReuseIdentifierKey">_NS:1199</string>
-														<reference key="NSTableView" ref="883963765"/>
+														<reference key="NSTableView" ref="677931807"/>
 													</object>
 													<object class="_NSCornerView" key="NSCornerView">
 														<nil key="NSNextResponder"/>
@@ -115,7 +115,7 @@
 													</object>
 													<object class="NSMutableArray" key="NSTableColumns">
 														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSTableColumn" id="604971708">
+														<object class="NSTableColumn" id="62891107">
 															<double key="NSWidth">284.265625</double>
 															<double key="NSMinWidth">250</double>
 															<double key="NSMaxWidth">500</double>
@@ -128,31 +128,31 @@
 																	<double key="NSSize">11</double>
 																	<int key="NSfFlags">3100</int>
 																</object>
-																<object class="NSColor" key="NSBackgroundColor" id="837680084">
+																<object class="NSColor" key="NSBackgroundColor" id="344446895">
 																	<int key="NSColorSpace">3</int>
 																	<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
 																</object>
-																<object class="NSColor" key="NSTextColor" id="818441314">
+																<object class="NSColor" key="NSTextColor" id="333748245">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">headerTextColor</string>
-																	<object class="NSColor" key="NSColor" id="117865178">
+																	<object class="NSColor" key="NSColor" id="783264194">
 																		<int key="NSColorSpace">3</int>
 																		<bytes key="NSWhite">MAA</bytes>
 																	</object>
 																</object>
 															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="622881488">
+															<object class="NSTextFieldCell" key="NSDataCell" id="722993368">
 																<int key="NSCellFlags">337772096</int>
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Text Cell</string>
-																<object class="NSFont" key="NSSupport" id="575793917">
+																<object class="NSFont" key="NSSupport" id="296237989">
 																	<string key="NSName">LucidaGrande</string>
 																	<double key="NSSize">13</double>
 																	<int key="NSfFlags">1044</int>
 																</object>
-																<reference key="NSControlView" ref="883963765"/>
-																<object class="NSColor" key="NSBackgroundColor" id="54458251">
+																<reference key="NSControlView" ref="677931807"/>
+																<object class="NSColor" key="NSBackgroundColor" id="389294598">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">controlBackgroundColor</string>
@@ -161,19 +161,19 @@
 																		<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 																	</object>
 																</object>
-																<object class="NSColor" key="NSTextColor" id="488014532">
+																<object class="NSColor" key="NSTextColor" id="100436510">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">controlTextColor</string>
-																	<reference key="NSColor" ref="117865178"/>
+																	<reference key="NSColor" ref="783264194"/>
 																</object>
 															</object>
 															<int key="NSResizingMask">3</int>
 															<bool key="NSIsResizeable">YES</bool>
 															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="883963765"/>
+															<reference key="NSTableView" ref="677931807"/>
 														</object>
-														<object class="NSTableColumn" id="281095551">
+														<object class="NSTableColumn" id="1071402749">
 															<double key="NSWidth">846.296875</double>
 															<double key="NSMinWidth">50</double>
 															<double key="NSMaxWidth">5200</double>
@@ -182,24 +182,24 @@
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Notes</string>
 																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="837680084"/>
-																<reference key="NSTextColor" ref="818441314"/>
+																<reference key="NSBackgroundColor" ref="344446895"/>
+																<reference key="NSTextColor" ref="333748245"/>
 															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="584810534">
+															<object class="NSTextFieldCell" key="NSDataCell" id="229865976">
 																<int key="NSCellFlags">337772096</int>
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="575793917"/>
-																<reference key="NSControlView" ref="883963765"/>
-																<reference key="NSBackgroundColor" ref="54458251"/>
-																<reference key="NSTextColor" ref="488014532"/>
+																<reference key="NSSupport" ref="296237989"/>
+																<reference key="NSControlView" ref="677931807"/>
+																<reference key="NSBackgroundColor" ref="389294598"/>
+																<reference key="NSTextColor" ref="100436510"/>
 															</object>
 															<int key="NSResizingMask">3</int>
 															<bool key="NSIsResizeable">YES</bool>
 															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="883963765"/>
+															<reference key="NSTableView" ref="677931807"/>
 														</object>
-														<object class="NSTableColumn" id="583431654">
+														<object class="NSTableColumn" id="1013716346">
 															<double key="NSWidth">140</double>
 															<double key="NSMinWidth">140</double>
 															<double key="NSMaxWidth">140</double>
@@ -208,23 +208,23 @@
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Date</string>
 																<reference key="NSSupport" ref="26"/>
-																<object class="NSColor" key="NSBackgroundColor" id="958831354">
+																<object class="NSColor" key="NSBackgroundColor" id="625279955">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">headerColor</string>
-																	<object class="NSColor" key="NSColor" id="498480307">
+																	<object class="NSColor" key="NSColor" id="654197677">
 																		<int key="NSColorSpace">3</int>
 																		<bytes key="NSWhite">MQA</bytes>
 																	</object>
 																</object>
-																<reference key="NSTextColor" ref="818441314"/>
+																<reference key="NSTextColor" ref="333748245"/>
 															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="701825234">
+															<object class="NSTextFieldCell" key="NSDataCell" id="767978022">
 																<int key="NSCellFlags">337772096</int>
 																<int key="NSCellFlags2">-2147481600</int>
 																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="575793917"/>
-																<object class="NSDateFormatter" key="NSFormatter" id="689250271">
+																<reference key="NSSupport" ref="296237989"/>
+																<object class="NSDateFormatter" key="NSFormatter" id="1046086656">
 																	<object class="NSMutableDictionary" key="NS.attributes">
 																		<bool key="EncodedWithXMLCoder">YES</bool>
 																		<object class="NSArray" key="dict.sortedKeys">
@@ -247,20 +247,20 @@
 																	<string key="NS.format">yyyy-MM-dd HH:mm </string>
 																	<bool key="NS.natural">NO</bool>
 																</object>
-																<reference key="NSControlView" ref="883963765"/>
-																<reference key="NSBackgroundColor" ref="54458251"/>
-																<reference key="NSTextColor" ref="488014532"/>
+																<reference key="NSControlView" ref="677931807"/>
+																<reference key="NSBackgroundColor" ref="389294598"/>
+																<reference key="NSTextColor" ref="100436510"/>
 															</object>
 															<int key="NSResizingMask">3</int>
 															<bool key="NSIsResizeable">YES</bool>
 															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="883963765"/>
+															<reference key="NSTableView" ref="677931807"/>
 														</object>
 													</object>
 													<double key="NSIntercellSpacingWidth">3</double>
 													<double key="NSIntercellSpacingHeight">2</double>
-													<reference key="NSBackgroundColor" ref="498480307"/>
-													<object class="NSColor" key="NSGridColor" id="704995593">
+													<reference key="NSBackgroundColor" ref="654197677"/>
+													<object class="NSColor" key="NSGridColor" id="258930933">
 														<int key="NSColorSpace">6</int>
 														<string key="NSCatalogName">System</string>
 														<string key="NSColorName">gridColor</string>
@@ -282,82 +282,82 @@
 												</object>
 											</object>
 											<string key="NSFrame">{{1, 17}, {1278, 183}}</string>
-											<reference key="NSSuperview" ref="734376697"/>
+											<reference key="NSSuperview" ref="141262373"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="883963765"/>
+											<reference key="NSNextKeyView" ref="677931807"/>
 											<string key="NSReuseIdentifierKey">_NS:1195</string>
-											<reference key="NSDocView" ref="883963765"/>
-											<reference key="NSBGColor" ref="54458251"/>
+											<reference key="NSDocView" ref="677931807"/>
+											<reference key="NSBGColor" ref="389294598"/>
 											<int key="NScvFlags">4</int>
 										</object>
-										<object class="NSScroller" id="1052203769">
-											<reference key="NSNextResponder" ref="734376697"/>
+										<object class="NSScroller" id="728081730">
+											<reference key="NSNextResponder" ref="141262373"/>
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-											<reference key="NSSuperview" ref="734376697"/>
+											<reference key="NSSuperview" ref="141262373"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="298855972"/>
+											<reference key="NSNextKeyView" ref="876748930"/>
 											<string key="NSReuseIdentifierKey">_NS:1214</string>
-											<reference key="NSTarget" ref="734376697"/>
+											<reference key="NSTarget" ref="141262373"/>
 											<string key="NSAction">_doScroller:</string>
 											<double key="NSCurValue">37</double>
 											<double key="NSPercent">0.1947367936372757</double>
 										</object>
-										<object class="NSScroller" id="298855972">
-											<reference key="NSNextResponder" ref="734376697"/>
+										<object class="NSScroller" id="876748930">
+											<reference key="NSNextResponder" ref="141262373"/>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{1, 185}, {1278, 15}}</string>
-											<reference key="NSSuperview" ref="734376697"/>
+											<reference key="NSSuperview" ref="141262373"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="1061166861"/>
+											<reference key="NSNextKeyView" ref="645991839"/>
 											<string key="NSReuseIdentifierKey">_NS:1216</string>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSsFlags">1</int>
-											<reference key="NSTarget" ref="734376697"/>
+											<reference key="NSTarget" ref="141262373"/>
 											<string key="NSAction">_doScroller:</string>
 											<double key="NSPercent">0.99921813917122748</double>
 										</object>
-										<object class="NSClipView" id="358070184">
-											<reference key="NSNextResponder" ref="734376697"/>
+										<object class="NSClipView" id="950826239">
+											<reference key="NSNextResponder" ref="141262373"/>
 											<int key="NSvFlags">2304</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<reference ref="426832557"/>
+												<reference ref="10263050"/>
 											</object>
 											<string key="NSFrame">{{1, 0}, {1278, 17}}</string>
-											<reference key="NSSuperview" ref="734376697"/>
+											<reference key="NSSuperview" ref="141262373"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="426832557"/>
+											<reference key="NSNextKeyView" ref="10263050"/>
 											<string key="NSReuseIdentifierKey">_NS:1200</string>
-											<reference key="NSDocView" ref="426832557"/>
-											<reference key="NSBGColor" ref="54458251"/>
+											<reference key="NSDocView" ref="10263050"/>
+											<reference key="NSBGColor" ref="389294598"/>
 											<int key="NScvFlags">4</int>
 										</object>
 									</object>
 									<string key="NSFrameSize">{1280, 201}</string>
-									<reference key="NSSuperview" ref="535035241"/>
+									<reference key="NSSuperview" ref="240403983"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="358070184"/>
+									<reference key="NSNextKeyView" ref="950826239"/>
 									<string key="NSReuseIdentifierKey">_NS:1193</string>
 									<int key="NSsFlags">133810</int>
-									<reference key="NSVScroller" ref="1052203769"/>
-									<reference key="NSHScroller" ref="298855972"/>
-									<reference key="NSContentView" ref="199473590"/>
-									<reference key="NSHeaderClipView" ref="358070184"/>
+									<reference key="NSVScroller" ref="728081730"/>
+									<reference key="NSHScroller" ref="876748930"/>
+									<reference key="NSContentView" ref="735378444"/>
+									<reference key="NSHeaderClipView" ref="950826239"/>
 									<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 								</object>
-								<object class="NSBox" id="1061166861">
-									<reference key="NSNextResponder" ref="535035241"/>
-									<int key="NSvFlags">12</int>
+								<object class="NSBox" id="645991839">
+									<reference key="NSNextResponder" ref="240403983"/>
+									<int key="NSvFlags">268</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSView" id="750156317">
-											<reference key="NSNextResponder" ref="1061166861"/>
+										<object class="NSView" id="278111632">
+											<reference key="NSNextResponder" ref="645991839"/>
 											<int key="NSvFlags">274</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="QTMovieView" id="495069288">
-													<reference key="NSNextResponder" ref="750156317"/>
+												<object class="QTMovieView" id="107556775">
+													<reference key="NSNextResponder" ref="278111632"/>
 													<int key="NSvFlags">298</int>
 													<object class="NSMutableSet" key="NSDragTypes">
 														<bool key="EncodedWithXMLCoder">YES</bool>
@@ -369,45 +369,45 @@
 															<string>QTMoviePasteboardType</string>
 														</object>
 													</object>
-													<string key="NSFrame">{{0, 577}, {1280, 20}}</string>
-													<reference key="NSSuperview" ref="750156317"/>
+													<string key="NSFrame">{{0, 581}, {1280, 16}}</string>
+													<reference key="NSSuperview" ref="278111632"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="954034204"/>
+													<reference key="NSNextKeyView" ref="433502865"/>
 													<string key="NSReuseIdentifierKey">_NS:46</string>
-													<reference key="kCoderFillColor" ref="117865178"/>
+													<reference key="kCoderFillColor" ref="783264194"/>
 													<boolean value="YES" key="kCoderControllerVisible"/>
 													<boolean value="YES" key="kCoderPreservesAspectRatio"/>
 													<nil key="kCoderMovie"/>
 													<boolean value="NO" key="kCoderEditable"/>
 												</object>
-												<object class="NSScrollView" id="954034204">
-													<reference key="NSNextResponder" ref="750156317"/>
+												<object class="NSScrollView" id="433502865">
+													<reference key="NSNextResponder" ref="278111632"/>
 													<int key="NSvFlags">310</int>
 													<object class="NSMutableArray" key="NSSubviews">
 														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSClipView" id="1034152607">
-															<reference key="NSNextResponder" ref="954034204"/>
+														<object class="NSClipView" id="515468715">
+															<reference key="NSNextResponder" ref="433502865"/>
 															<int key="NSvFlags">2304</int>
 															<object class="NSMutableArray" key="NSSubviews">
 																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSTableView" id="1053599055">
-																	<reference key="NSNextResponder" ref="1034152607"/>
+																<object class="NSTableView" id="187344935">
+																	<reference key="NSNextResponder" ref="515468715"/>
 																	<int key="NSvFlags">256</int>
-																	<string key="NSFrameSize">{1359, 543}</string>
-																	<reference key="NSSuperview" ref="1034152607"/>
+																	<string key="NSFrameSize">{1359, 564}</string>
+																	<reference key="NSSuperview" ref="515468715"/>
 																	<reference key="NSWindow"/>
-																	<reference key="NSNextKeyView" ref="971444524"/>
+																	<reference key="NSNextKeyView" ref="113223090"/>
 																	<string key="NSReuseIdentifierKey">_NS:1197</string>
 																	<bool key="NSEnabled">YES</bool>
-																	<object class="NSTableHeaderView" key="NSHeaderView" id="944338834">
-																		<reference key="NSNextResponder" ref="1071959580"/>
+																	<object class="NSTableHeaderView" key="NSHeaderView" id="401256486">
+																		<reference key="NSNextResponder" ref="375606828"/>
 																		<int key="NSvFlags">256</int>
 																		<string key="NSFrameSize">{1359, 17}</string>
-																		<reference key="NSSuperview" ref="1071959580"/>
+																		<reference key="NSSuperview" ref="375606828"/>
 																		<reference key="NSWindow"/>
-																		<reference key="NSNextKeyView" ref="1034152607"/>
+																		<reference key="NSNextKeyView" ref="515468715"/>
 																		<string key="NSReuseIdentifierKey">_NS:1199</string>
-																		<reference key="NSTableView" ref="1053599055"/>
+																		<reference key="NSTableView" ref="187344935"/>
 																	</object>
 																	<object class="_NSCornerView" key="NSCornerView">
 																		<nil key="NSNextResponder"/>
@@ -417,7 +417,7 @@
 																	</object>
 																	<object class="NSMutableArray" key="NSTableColumns">
 																		<bool key="EncodedWithXMLCoder">YES</bool>
-																		<object class="NSTableColumn" id="701295833">
+																		<object class="NSTableColumn" id="284421416">
 																			<double key="NSWidth">100</double>
 																			<double key="NSMinWidth">100</double>
 																			<double key="NSMaxWidth">100</double>
@@ -426,27 +426,26 @@
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Time</string>
 																				<reference key="NSSupport" ref="26"/>
-																				<object class="NSColor" key="NSBackgroundColor" id="670848296">
+																				<object class="NSColor" key="NSBackgroundColor" id="995207238">
 																					<int key="NSColorSpace">3</int>
 																					<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
 																				</object>
-																				<reference key="NSTextColor" ref="818441314"/>
+																				<reference key="NSTextColor" ref="333748245"/>
 																			</object>
-																			<object class="NSTextFieldCell" key="NSDataCell" id="203345927">
+																			<object class="NSTextFieldCell" key="NSDataCell" id="964970916">
 																				<int key="NSCellFlags">337772096</int>
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Text Cell</string>
-																				<reference key="NSSupport" ref="575793917"/>
-																				<reference key="NSControlView" ref="1053599055"/>
-																				<reference key="NSBackgroundColor" ref="54458251"/>
-																				<reference key="NSTextColor" ref="488014532"/>
+																				<reference key="NSSupport" ref="296237989"/>
+																				<reference key="NSControlView" ref="187344935"/>
+																				<reference key="NSBackgroundColor" ref="389294598"/>
+																				<reference key="NSTextColor" ref="100436510"/>
 																			</object>
 																			<int key="NSResizingMask">3</int>
 																			<bool key="NSIsResizeable">YES</bool>
-																			<bool key="NSIsEditable">YES</bool>
-																			<reference key="NSTableView" ref="1053599055"/>
+																			<reference key="NSTableView" ref="187344935"/>
 																		</object>
-																		<object class="NSTableColumn" id="816547324">
+																		<object class="NSTableColumn" id="673713016">
 																			<double key="NSWidth">550</double>
 																			<double key="NSMinWidth">200</double>
 																			<double key="NSMaxWidth">2000</double>
@@ -455,24 +454,24 @@
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Tags</string>
 																				<reference key="NSSupport" ref="26"/>
-																				<reference key="NSBackgroundColor" ref="670848296"/>
-																				<reference key="NSTextColor" ref="818441314"/>
+																				<reference key="NSBackgroundColor" ref="995207238"/>
+																				<reference key="NSTextColor" ref="333748245"/>
 																			</object>
-																			<object class="NSTextFieldCell" key="NSDataCell" id="871004575">
+																			<object class="NSTextFieldCell" key="NSDataCell" id="657615961">
 																				<int key="NSCellFlags">337772096</int>
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Text Cell</string>
-																				<reference key="NSSupport" ref="575793917"/>
-																				<reference key="NSControlView" ref="1053599055"/>
-																				<reference key="NSBackgroundColor" ref="54458251"/>
-																				<reference key="NSTextColor" ref="488014532"/>
+																				<reference key="NSSupport" ref="296237989"/>
+																				<reference key="NSControlView" ref="187344935"/>
+																				<reference key="NSBackgroundColor" ref="389294598"/>
+																				<reference key="NSTextColor" ref="100436510"/>
 																			</object>
 																			<int key="NSResizingMask">3</int>
 																			<bool key="NSIsResizeable">YES</bool>
 																			<bool key="NSIsEditable">YES</bool>
-																			<reference key="NSTableView" ref="1053599055"/>
+																			<reference key="NSTableView" ref="187344935"/>
 																		</object>
-																		<object class="NSTableColumn" id="909755807">
+																		<object class="NSTableColumn" id="864535406">
 																			<double key="NSWidth">700</double>
 																			<double key="NSMinWidth">50</double>
 																			<double key="NSMaxWidth">3.4028234663852886e+38</double>
@@ -481,32 +480,33 @@
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Notes</string>
 																				<reference key="NSSupport" ref="26"/>
-																				<reference key="NSBackgroundColor" ref="958831354"/>
-																				<reference key="NSTextColor" ref="818441314"/>
+																				<reference key="NSBackgroundColor" ref="625279955"/>
+																				<reference key="NSTextColor" ref="333748245"/>
 																			</object>
-																			<object class="NSTextFieldCell" key="NSDataCell" id="324026516">
+																			<object class="NSTextFieldCell" key="NSDataCell" id="712731318">
 																				<int key="NSCellFlags">337772096</int>
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Text Cell</string>
-																				<reference key="NSSupport" ref="575793917"/>
-																				<reference key="NSControlView" ref="1053599055"/>
-																				<reference key="NSBackgroundColor" ref="54458251"/>
-																				<reference key="NSTextColor" ref="488014532"/>
+																				<reference key="NSSupport" ref="296237989"/>
+																				<reference key="NSControlView" ref="187344935"/>
+																				<reference key="NSBackgroundColor" ref="389294598"/>
+																				<reference key="NSTextColor" ref="100436510"/>
 																			</object>
 																			<int key="NSResizingMask">3</int>
 																			<bool key="NSIsResizeable">YES</bool>
 																			<bool key="NSIsEditable">YES</bool>
-																			<reference key="NSTableView" ref="1053599055"/>
+																			<reference key="NSTableView" ref="187344935"/>
 																		</object>
 																	</object>
 																	<double key="NSIntercellSpacingWidth">3</double>
 																	<double key="NSIntercellSpacingHeight">2</double>
-																	<reference key="NSBackgroundColor" ref="498480307"/>
-																	<reference key="NSGridColor" ref="704995593"/>
+																	<reference key="NSBackgroundColor" ref="654197677"/>
+																	<reference key="NSGridColor" ref="258930933"/>
 																	<double key="NSRowHeight">17</double>
-																	<int key="NSTvFlags">-555712512</int>
+																	<int key="NSTvFlags">-18841600</int>
 																	<reference key="NSDelegate"/>
 																	<reference key="NSDataSource"/>
+																	<int key="NSGridStyleMask">1</int>
 																	<int key="NSColumnAutoresizingStyle">1</int>
 																	<int key="NSDraggingSourceMaskForLocal">15</int>
 																	<int key="NSDraggingSourceMaskForNonLocal">0</int>
@@ -515,81 +515,81 @@
 																	<int key="NSTableViewGroupRowStyle">1</int>
 																</object>
 															</object>
-															<string key="NSFrame">{{1, 17}, {1278, 543}}</string>
-															<reference key="NSSuperview" ref="954034204"/>
+															<string key="NSFrame">{{1, 17}, {1278, 564}}</string>
+															<reference key="NSSuperview" ref="433502865"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="1053599055"/>
+															<reference key="NSNextKeyView" ref="187344935"/>
 															<string key="NSReuseIdentifierKey">_NS:1195</string>
-															<reference key="NSDocView" ref="1053599055"/>
-															<reference key="NSBGColor" ref="54458251"/>
+															<reference key="NSDocView" ref="187344935"/>
+															<reference key="NSBGColor" ref="389294598"/>
 															<int key="NScvFlags">4</int>
 														</object>
-														<object class="NSScroller" id="971444524">
-															<reference key="NSNextResponder" ref="954034204"/>
+														<object class="NSScroller" id="113223090">
+															<reference key="NSNextResponder" ref="433502865"/>
 															<int key="NSvFlags">-2147483392</int>
 															<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-															<reference key="NSSuperview" ref="954034204"/>
+															<reference key="NSSuperview" ref="433502865"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="885043804"/>
+															<reference key="NSNextKeyView" ref="940894617"/>
 															<string key="NSReuseIdentifierKey">_NS:1214</string>
-															<reference key="NSTarget" ref="954034204"/>
+															<reference key="NSTarget" ref="433502865"/>
 															<string key="NSAction">_doScroller:</string>
 															<double key="NSPercent">0.98210290827740487</double>
 														</object>
-														<object class="NSScroller" id="885043804">
-															<reference key="NSNextResponder" ref="954034204"/>
+														<object class="NSScroller" id="940894617">
+															<reference key="NSNextResponder" ref="433502865"/>
 															<int key="NSvFlags">256</int>
-															<string key="NSFrame">{{1, 545}, {1278, 15}}</string>
-															<reference key="NSSuperview" ref="954034204"/>
+															<string key="NSFrame">{{1, 566}, {1278, 15}}</string>
+															<reference key="NSSuperview" ref="433502865"/>
 															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView"/>
 															<string key="NSReuseIdentifierKey">_NS:1216</string>
 															<bool key="NSEnabled">YES</bool>
 															<int key="NSsFlags">1</int>
-															<reference key="NSTarget" ref="954034204"/>
+															<reference key="NSTarget" ref="433502865"/>
 															<string key="NSAction">_doScroller:</string>
 															<double key="NSPercent">0.94039735099337751</double>
 														</object>
-														<object class="NSClipView" id="1071959580">
-															<reference key="NSNextResponder" ref="954034204"/>
+														<object class="NSClipView" id="375606828">
+															<reference key="NSNextResponder" ref="433502865"/>
 															<int key="NSvFlags">2304</int>
 															<object class="NSMutableArray" key="NSSubviews">
 																<bool key="EncodedWithXMLCoder">YES</bool>
-																<reference ref="944338834"/>
+																<reference ref="401256486"/>
 															</object>
 															<string key="NSFrame">{{1, 0}, {1278, 17}}</string>
-															<reference key="NSSuperview" ref="954034204"/>
+															<reference key="NSSuperview" ref="433502865"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="944338834"/>
-															<reference key="NSDocView" ref="944338834"/>
-															<reference key="NSBGColor" ref="54458251"/>
+															<reference key="NSNextKeyView" ref="401256486"/>
+															<reference key="NSDocView" ref="401256486"/>
+															<reference key="NSBGColor" ref="389294598"/>
 															<int key="NScvFlags">4</int>
 														</object>
 													</object>
-													<string key="NSFrame">{{0, 1}, {1280, 561}}</string>
-													<reference key="NSSuperview" ref="750156317"/>
+													<string key="NSFrame">{{0, -1}, {1280, 582}}</string>
+													<reference key="NSSuperview" ref="278111632"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="1071959580"/>
+													<reference key="NSNextKeyView" ref="375606828"/>
 													<string key="NSReuseIdentifierKey">_NS:1193</string>
 													<int key="NSsFlags">133810</int>
-													<reference key="NSVScroller" ref="971444524"/>
-													<reference key="NSHScroller" ref="885043804"/>
-													<reference key="NSContentView" ref="1034152607"/>
-													<reference key="NSHeaderClipView" ref="1071959580"/>
+													<reference key="NSVScroller" ref="113223090"/>
+													<reference key="NSHScroller" ref="940894617"/>
+													<reference key="NSContentView" ref="515468715"/>
+													<reference key="NSHeaderClipView" ref="375606828"/>
 													<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 												</object>
 											</object>
 											<string key="NSFrameSize">{1280, 599}</string>
-											<reference key="NSSuperview" ref="1061166861"/>
+											<reference key="NSSuperview" ref="645991839"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="495069288"/>
+											<reference key="NSNextKeyView" ref="107556775"/>
 											<string key="NSReuseIdentifierKey">_NS:11</string>
 										</object>
 									</object>
 									<string key="NSFrame">{{0, 211}, {1280, 599}}</string>
-									<reference key="NSSuperview" ref="535035241"/>
+									<reference key="NSSuperview" ref="240403983"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="750156317"/>
+									<reference key="NSNextKeyView" ref="278111632"/>
 									<string key="NSReuseIdentifierKey">_NS:9</string>
 									<string key="NSOffsets">{0, 0}</string>
 									<object class="NSTextFieldCell" key="NSTitleCell">
@@ -601,14 +601,14 @@
 											<int key="NSColorSpace">6</int>
 											<string key="NSCatalogName">System</string>
 											<string key="NSColorName">textBackgroundColor</string>
-											<reference key="NSColor" ref="498480307"/>
+											<reference key="NSColor" ref="654197677"/>
 										</object>
 										<object class="NSColor" key="NSTextColor">
 											<int key="NSColorSpace">3</int>
 											<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
 										</object>
 									</object>
-									<reference key="NSContentView" ref="750156317"/>
+									<reference key="NSContentView" ref="278111632"/>
 									<int key="NSBorderType">0</int>
 									<int key="NSBoxType">4</int>
 									<int key="NSTitlePosition">0</int>
@@ -616,17 +616,17 @@
 									<real value="0.0" key="NSBorderWidth2"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{-1, 0}, {1280, 810}}</string>
+							<string key="NSFrameSize">{1280, 810}</string>
 							<reference key="NSSuperview" ref="568628114"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="734376697"/>
+							<reference key="NSNextKeyView" ref="141262373"/>
 							<int key="NSDividerStyle">3</int>
 						</object>
 					</object>
 					<string key="NSFrameSize">{1279, 809}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="535035241"/>
+					<reference key="NSNextKeyView" ref="240403983"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMinSize">{94, 108}</string>
@@ -636,7 +636,7 @@
 			<object class="NSCustomObject" id="796877042">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSArrayController" id="694541878">
+			<object class="NSArrayController" id="926600176">
 				<object class="_NSManagedProxy" key="_NSManagedProxy">
 					<string key="NSEntityName">MAMedia</string>
 					<object class="NSCompoundPredicate" key="NSFetchPredicate">
@@ -646,7 +646,7 @@
 								<object class="NSKeyPathExpression" key="NSLeftExpression">
 									<int key="NSExpressionType">3</int>
 									<string key="NSSelectorName">valueForKey:</string>
-									<object class="NSSelfExpression" key="NSOperand" id="468472657">
+									<object class="NSSelfExpression" key="NSOperand" id="343322019">
 										<int key="NSExpressionType">1</int>
 									</object>
 									<object class="NSMutableArray" key="NSArguments">
@@ -672,7 +672,7 @@
 								<object class="NSKeyPathExpression" key="NSLeftExpression">
 									<int key="NSExpressionType">3</int>
 									<string key="NSSelectorName">valueForKey:</string>
-									<reference key="NSOperand" ref="468472657"/>
+									<reference key="NSOperand" ref="343322019"/>
 									<object class="NSMutableArray" key="NSArguments">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSKeyPathSpecifierExpression">
@@ -704,10 +704,10 @@
 				<bool key="NSFilterRestrictsInsertion">YES</bool>
 				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
 			</object>
-			<object class="NSUserDefaultsController" id="91315493">
+			<object class="NSUserDefaultsController" id="3419284">
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
-			<object class="NSObjectController" id="1052611063">
+			<object class="NSObjectController" id="530788161">
 				<bool key="NSAutomaticallyPreparesContent">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy">
 					<string key="NSEntityName">MAFolder</string>
@@ -718,7 +718,7 @@
 								<object class="NSKeyPathExpression" key="NSLeftExpression">
 									<int key="NSExpressionType">3</int>
 									<string key="NSSelectorName">valueForKey:</string>
-									<reference key="NSOperand" ref="468472657"/>
+									<reference key="NSOperand" ref="343322019"/>
 									<object class="NSMutableArray" key="NSArguments">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSKeyPathSpecifierExpression">
@@ -742,7 +742,7 @@
 								<object class="NSKeyPathExpression" key="NSLeftExpression">
 									<int key="NSExpressionType">3</int>
 									<string key="NSSelectorName">valueForKey:</string>
-									<reference key="NSOperand" ref="468472657"/>
+									<reference key="NSOperand" ref="343322019"/>
 									<object class="NSMutableArray" key="NSArguments">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSKeyPathSpecifierExpression">
@@ -768,6 +768,19 @@
 				</object>
 				<bool key="_NSIsUsingManagedProxy">YES</bool>
 			</object>
+			<object class="NSArrayController" id="780925118">
+				<bool key="NSEditable">YES</bool>
+				<bool key="NSAutomaticallyPreparesContent">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy">
+					<string key="NSEntityName">MAAnno</string>
+				</object>
+				<bool key="_NSIsUsingManagedProxy">YES</bool>
+				<bool key="_NSUsesLazyFetching">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -791,11 +804,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.name</string>
-						<reference key="source" ref="604971708"/>
-						<reference key="destination" ref="694541878"/>
+						<reference key="source" ref="62891107"/>
+						<reference key="destination" ref="926600176"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="604971708"/>
-							<reference key="NSDestination" ref="694541878"/>
+							<reference key="NSSource" ref="62891107"/>
+							<reference key="NSDestination" ref="926600176"/>
 							<string key="NSLabel">value: arrangedObjects.name</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">arrangedObjects.name</string>
@@ -807,11 +820,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.notes</string>
-						<reference key="source" ref="281095551"/>
-						<reference key="destination" ref="694541878"/>
+						<reference key="source" ref="1071402749"/>
+						<reference key="destination" ref="926600176"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="281095551"/>
-							<reference key="NSDestination" ref="694541878"/>
+							<reference key="NSSource" ref="1071402749"/>
+							<reference key="NSDestination" ref="926600176"/>
 							<string key="NSLabel">value: arrangedObjects.notes</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">arrangedObjects.notes</string>
@@ -823,11 +836,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.date</string>
-						<reference key="source" ref="583431654"/>
-						<reference key="destination" ref="694541878"/>
+						<reference key="source" ref="1013716346"/>
+						<reference key="destination" ref="926600176"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="583431654"/>
-							<reference key="NSDestination" ref="694541878"/>
+							<reference key="NSSource" ref="1013716346"/>
+							<reference key="NSDestination" ref="926600176"/>
 							<string key="NSLabel">value: arrangedObjects.date</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">arrangedObjects.date</string>
@@ -843,11 +856,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">movie: selection.movie</string>
-						<reference key="source" ref="495069288"/>
-						<reference key="destination" ref="694541878"/>
+						<reference key="source" ref="107556775"/>
+						<reference key="destination" ref="926600176"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="495069288"/>
-							<reference key="NSDestination" ref="694541878"/>
+							<reference key="NSSource" ref="107556775"/>
+							<reference key="NSDestination" ref="926600176"/>
 							<string key="NSLabel">movie: selection.movie</string>
 							<string key="NSBinding">movie</string>
 							<string key="NSKeyPath">selection.movie</string>
@@ -859,11 +872,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentSet: selection.contents</string>
-						<reference key="source" ref="694541878"/>
-						<reference key="destination" ref="1052611063"/>
+						<reference key="source" ref="926600176"/>
+						<reference key="destination" ref="530788161"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="694541878"/>
-							<reference key="NSDestination" ref="1052611063"/>
+							<reference key="NSSource" ref="926600176"/>
+							<reference key="NSDestination" ref="530788161"/>
 							<string key="NSLabel">contentSet: selection.contents</string>
 							<string key="NSBinding">contentSet</string>
 							<string key="NSKeyPath">selection.contents</string>
@@ -879,10 +892,10 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">managedObjectContext: document.managedObjectContext</string>
-						<reference key="source" ref="1052611063"/>
+						<reference key="source" ref="530788161"/>
 						<reference key="destination" ref="512844837"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1052611063"/>
+							<reference key="NSSource" ref="530788161"/>
 							<reference key="NSDestination" ref="512844837"/>
 							<string key="NSLabel">managedObjectContext: document.managedObjectContext</string>
 							<string key="NSBinding">managedObjectContext</string>
@@ -892,6 +905,58 @@
 					</object>
 					<int key="connectionID">100147</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentSet: selection.annotations</string>
+						<reference key="source" ref="780925118"/>
+						<reference key="destination" ref="926600176"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="780925118"/>
+							<reference key="NSDestination" ref="926600176"/>
+							<string key="NSLabel">contentSet: selection.annotations</string>
+							<string key="NSBinding">contentSet</string>
+							<string key="NSKeyPath">selection.annotations</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSDeletesObjectsOnRemove</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">100151</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.location</string>
+						<reference key="source" ref="284421416"/>
+						<reference key="destination" ref="780925118"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="284421416"/>
+							<reference key="NSDestination" ref="780925118"/>
+							<string key="NSLabel">value: arrangedObjects.location</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.location</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">100153</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.notes</string>
+						<reference key="source" ref="864535406"/>
+						<reference key="destination" ref="780925118"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="864535406"/>
+							<reference key="NSDestination" ref="780925118"/>
+							<string key="NSLabel">value: arrangedObjects.notes</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.notes</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">100154</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -929,7 +994,7 @@
 						<reference key="object" ref="568628114"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="535035241"/>
+							<reference ref="240403983"/>
 						</object>
 						<reference key="parent" ref="275939982"/>
 					</object>
@@ -941,217 +1006,223 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100086</int>
-						<reference key="object" ref="694541878"/>
+						<reference key="object" ref="926600176"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">MediaController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100094</int>
-						<reference key="object" ref="91315493"/>
+						<reference key="object" ref="3419284"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100130</int>
-						<reference key="object" ref="535035241"/>
+						<reference key="object" ref="240403983"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="734376697"/>
-							<reference ref="1061166861"/>
+							<reference ref="141262373"/>
+							<reference ref="645991839"/>
 						</object>
 						<reference key="parent" ref="568628114"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100021</int>
-						<reference key="object" ref="734376697"/>
+						<reference key="object" ref="141262373"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="883963765"/>
-							<reference ref="298855972"/>
-							<reference ref="426832557"/>
-							<reference ref="1052203769"/>
+							<reference ref="677931807"/>
+							<reference ref="876748930"/>
+							<reference ref="10263050"/>
+							<reference ref="728081730"/>
 						</object>
-						<reference key="parent" ref="535035241"/>
+						<reference key="parent" ref="240403983"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100129</int>
-						<reference key="object" ref="1061166861"/>
+						<reference key="object" ref="645991839"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="954034204"/>
-							<reference ref="495069288"/>
+							<reference ref="433502865"/>
+							<reference ref="107556775"/>
 						</object>
-						<reference key="parent" ref="535035241"/>
+						<reference key="parent" ref="240403983"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100034</int>
-						<reference key="object" ref="954034204"/>
+						<reference key="object" ref="433502865"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="971444524"/>
-							<reference ref="944338834"/>
-							<reference ref="885043804"/>
-							<reference ref="1053599055"/>
+							<reference ref="113223090"/>
+							<reference ref="401256486"/>
+							<reference ref="940894617"/>
+							<reference ref="187344935"/>
 						</object>
-						<reference key="parent" ref="1061166861"/>
+						<reference key="parent" ref="645991839"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100033</int>
-						<reference key="object" ref="495069288"/>
-						<reference key="parent" ref="1061166861"/>
+						<reference key="object" ref="107556775"/>
+						<reference key="parent" ref="645991839"/>
 						<string key="objectName">Movie View</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100035</int>
-						<reference key="object" ref="971444524"/>
-						<reference key="parent" ref="954034204"/>
+						<reference key="object" ref="113223090"/>
+						<reference key="parent" ref="433502865"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100036</int>
-						<reference key="object" ref="944338834"/>
-						<reference key="parent" ref="954034204"/>
+						<reference key="object" ref="401256486"/>
+						<reference key="parent" ref="433502865"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100037</int>
-						<reference key="object" ref="885043804"/>
-						<reference key="parent" ref="954034204"/>
+						<reference key="object" ref="940894617"/>
+						<reference key="parent" ref="433502865"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100038</int>
-						<reference key="object" ref="1053599055"/>
+						<reference key="object" ref="187344935"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="701295833"/>
-							<reference ref="816547324"/>
-							<reference ref="909755807"/>
+							<reference ref="284421416"/>
+							<reference ref="673713016"/>
+							<reference ref="864535406"/>
 						</object>
-						<reference key="parent" ref="954034204"/>
+						<reference key="parent" ref="433502865"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100039</int>
-						<reference key="object" ref="701295833"/>
+						<reference key="object" ref="284421416"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="203345927"/>
+							<reference ref="964970916"/>
 						</object>
-						<reference key="parent" ref="1053599055"/>
+						<reference key="parent" ref="187344935"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100040</int>
-						<reference key="object" ref="816547324"/>
+						<reference key="object" ref="673713016"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="871004575"/>
+							<reference ref="657615961"/>
 						</object>
-						<reference key="parent" ref="1053599055"/>
+						<reference key="parent" ref="187344935"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100043</int>
-						<reference key="object" ref="909755807"/>
+						<reference key="object" ref="864535406"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="324026516"/>
+							<reference ref="712731318"/>
 						</object>
-						<reference key="parent" ref="1053599055"/>
+						<reference key="parent" ref="187344935"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100044</int>
-						<reference key="object" ref="324026516"/>
-						<reference key="parent" ref="909755807"/>
+						<reference key="object" ref="712731318"/>
+						<reference key="parent" ref="864535406"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100041</int>
-						<reference key="object" ref="871004575"/>
-						<reference key="parent" ref="816547324"/>
+						<reference key="object" ref="657615961"/>
+						<reference key="parent" ref="673713016"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100042</int>
-						<reference key="object" ref="203345927"/>
-						<reference key="parent" ref="701295833"/>
+						<reference key="object" ref="964970916"/>
+						<reference key="parent" ref="284421416"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100025</int>
-						<reference key="object" ref="883963765"/>
+						<reference key="object" ref="677931807"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="583431654"/>
-							<reference ref="281095551"/>
-							<reference ref="604971708"/>
+							<reference ref="1013716346"/>
+							<reference ref="1071402749"/>
+							<reference ref="62891107"/>
 						</object>
-						<reference key="parent" ref="734376697"/>
+						<reference key="parent" ref="141262373"/>
 						<string key="objectName">Table View</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100024</int>
-						<reference key="object" ref="298855972"/>
-						<reference key="parent" ref="734376697"/>
+						<reference key="object" ref="876748930"/>
+						<reference key="parent" ref="141262373"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100023</int>
-						<reference key="object" ref="426832557"/>
-						<reference key="parent" ref="734376697"/>
+						<reference key="object" ref="10263050"/>
+						<reference key="parent" ref="141262373"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100022</int>
-						<reference key="object" ref="1052203769"/>
-						<reference key="parent" ref="734376697"/>
+						<reference key="object" ref="728081730"/>
+						<reference key="parent" ref="141262373"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100030</int>
-						<reference key="object" ref="583431654"/>
+						<reference key="object" ref="1013716346"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="701825234"/>
+							<reference ref="767978022"/>
 						</object>
-						<reference key="parent" ref="883963765"/>
+						<reference key="parent" ref="677931807"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100027</int>
-						<reference key="object" ref="281095551"/>
+						<reference key="object" ref="1071402749"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="584810534"/>
+							<reference ref="229865976"/>
 						</object>
-						<reference key="parent" ref="883963765"/>
+						<reference key="parent" ref="677931807"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100026</int>
-						<reference key="object" ref="604971708"/>
+						<reference key="object" ref="62891107"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="622881488"/>
+							<reference ref="722993368"/>
 						</object>
-						<reference key="parent" ref="883963765"/>
+						<reference key="parent" ref="677931807"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100029</int>
-						<reference key="object" ref="622881488"/>
-						<reference key="parent" ref="604971708"/>
+						<reference key="object" ref="722993368"/>
+						<reference key="parent" ref="62891107"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100028</int>
-						<reference key="object" ref="584810534"/>
-						<reference key="parent" ref="281095551"/>
+						<reference key="object" ref="229865976"/>
+						<reference key="parent" ref="1071402749"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100031</int>
-						<reference key="object" ref="701825234"/>
+						<reference key="object" ref="767978022"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="689250271"/>
+							<reference ref="1046086656"/>
 						</object>
-						<reference key="parent" ref="583431654"/>
+						<reference key="parent" ref="1013716346"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100032</int>
-						<reference key="object" ref="689250271"/>
-						<reference key="parent" ref="701825234"/>
+						<reference key="object" ref="1046086656"/>
+						<reference key="parent" ref="767978022"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100143</int>
-						<reference key="object" ref="1052611063"/>
+						<reference key="object" ref="530788161"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">SelectedFolderController</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100148</int>
+						<reference key="object" ref="780925118"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">AnnotationController</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1194,6 +1265,7 @@
 					<string>100130.IBPluginDependency</string>
 					<string>100143.IBPluginDependency</string>
 					<string>100143.ibExternalFetchPredicateFormat</string>
+					<string>100148.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
 					<string>5.IBWindowTemplateEditedContentRect</string>
 					<string>6.IBPluginDependency</string>
@@ -1237,6 +1309,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>name=='Inbox' AND parent==NULL</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{133, 170}, {507, 413}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
@@ -1253,7 +1326,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">100147</int>
+			<int key="maxID">100154</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">