diff --git a/build/installer/spark.install4j b/build/installer/spark.install4j
index 514dfe5b7..900b2e4f8 100644
--- a/build/installer/spark.install4j
+++ b/build/installer/spark.install4j
@@ -10,7 +10,7 @@
     <variables>
       <variable name="VERSION_MAJOR" value="2" />
       <variable name="VERSION_MINOR" value="0" />
-      <variable name="VERSION_REVISION" value="1" />
+      <variable name="VERSION_REVISION" value="0" />
       <variable name="APP_NAME" value="Spark" />
       <variable name="APP_SHORT_NAME" value="Spark" />
       <variable name="PUBLISHER" value="Jive Software" />
@@ -172,6 +172,8 @@
   </mediaSets>
   <buildIds buildAll="false">
     <mediaSet refId="2" />
+    <mediaSet refId="13" />
+    <mediaSet refId="19" />
   </buildIds>
 </install4j>
 
diff --git a/build/projects/Spark.iml b/build/projects/Spark.iml
index 3556030db..a2382b8c5 100644
--- a/build/projects/Spark.iml
+++ b/build/projects/Spark.iml
@@ -6,6 +6,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
       <sourceFolder url="file://$MODULE_DIR$/../../src/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/../../target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/build/projects/Spark.ipr b/build/projects/Spark.ipr
index 6825232e2..75ae807ce 100644
--- a/build/projects/Spark.ipr
+++ b/build/projects/Spark.ipr
@@ -2,13 +2,6 @@
 <project version="4" relativePaths="true">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
-    <buildFile url="file://$PROJECT_DIR$/../build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
   </component>
   <component name="CodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS" />
@@ -186,6 +179,7 @@
   </component>
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://C:/code/spark/plugins/fastpath/Fastpath.iml" filepath="C:/code/spark/plugins/fastpath/Fastpath.iml" />
       <module fileurl="file://$PROJECT_DIR$/Spark.iml" filepath="$PROJECT_DIR$/Spark.iml" />
     </modules>
   </component>
diff --git a/build/projects/Spark.iws b/build/projects/Spark.iws
index 98a8eb6da..c7d29596b 100644
--- a/build/projects/Spark.iws
+++ b/build/projects/Spark.iws
@@ -15,7 +15,11 @@
     <option name="CHANGE_AFTER" value="" />
   </component>
   <component name="CheckinPanelState">
+    <Excluded key="C:\spark\build\installer\spark.install4j" />
+    <Excluded key="C:\spark\build\projects\Spark.iml" />
+    <Excluded key="C:\spark\build\projects\Spark.ipr" />
     <Excluded key="C:\spark\build\projects\Spark.iws" />
+    <Excluded key="C:\code\spark\plugins\fastpath\Fastpath.iml" />
   </component>
   <component name="Commander">
     <leftPanel />
@@ -120,7 +124,17 @@
     <option name="myCurrentFavoritesList" value="Spark" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="Spark.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Spark.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="141" column="73" selection-start="4578" selection-end="4578" vertical-scroll-proportion="0.41976517">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -150,8 +164,8 @@
     <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
   </component>
   <component name="ModuleEditorState">
-    <option name="LAST_EDITED_MODULE_NAME" value="Spark" />
-    <option name="LAST_EDITED_TAB_NAME" value="Paths" />
+    <option name="LAST_EDITED_MODULE_NAME" value="Fastpath" />
+    <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
   </component>
   <component name="NamedScopeManager" />
   <component name="PackagesPane">
@@ -164,10 +178,6 @@
         <option name="myItemId" value="Spark" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
       </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="Libraries" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
-      </PATH_ELEMENT>
     </PATH>
     <PATH>
       <PATH_ELEMENT>
@@ -178,6 +188,34 @@
         <option name="myItemId" value="Spark" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
       </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="org.jivesoftware" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+      </PATH_ELEMENT>
+    </PATH>
+    <PATH>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="Spark.ipr" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="Fastpath" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+      </PATH_ELEMENT>
+    </PATH>
+    <PATH>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="Spark.ipr" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="Fastpath" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="com.jivesoftware.fastpath" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+      </PATH_ELEMENT>
     </PATH>
   </component>
   <component name="PerforceChangeBrowserSettings">
@@ -244,42 +282,12 @@
         <option name="myItemId" value="PsiDirectory:C:\spark" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\spark\src" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
     </PATH>
     <PATH>
       <PATH_ELEMENT>
         <option name="myItemId" value="Spark.ipr" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
       </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="Spark" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\spark" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-    </PATH>
-    <PATH>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="Spark.ipr" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="Spark" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\spark" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
-      <PATH_ELEMENT>
-        <option name="myItemId" value="PsiDirectory:C:\spark\build" />
-        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-      </PATH_ELEMENT>
     </PATH>
   </component>
   <component name="ProjectReloadState">
@@ -287,14 +295,14 @@
   </component>
   <component name="ProjectView">
     <navigator currentView="PackagesPane" splitterProportion="0.5">
-      <flattenPackages ProjectPane="true" />
+      <flattenPackages PackagesPane="false" ProjectPane="true" />
       <showMembers />
       <showModules />
       <showLibraryContents />
-      <hideEmptyPackages ProjectPane="true" />
+      <hideEmptyPackages PackagesPane="true" ProjectPane="true" />
       <abbreviatePackageNames />
       <showStructure PackagesPane="false" ProjectPane="false" />
-      <autoscrollToSource />
+      <autoscrollToSource PackagesPane="true" />
       <autoscrollFromSource />
       <sortByType />
     </navigator>
@@ -302,17 +310,17 @@
   <component name="PropertiesComponent">
     <property name="GoToClass.includeJavaFiles" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="cvs_file_history_treeWidth0" value="460" />
-    <property name="cvs_file_history_flatWidth2" value="460" />
+    <property name="cvs_file_history_treeWidth0" value="294" />
+    <property name="cvs_file_history_flatWidth2" value="294" />
     <property name="cvs_file_history_treeOrder1" value="1" />
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="cvs_file_history_flatOrder1" value="1" />
-    <property name="cvs_file_history_flatWidth1" value="461" />
-    <property name="cvs_file_history_treeWidth1" value="461" />
+    <property name="cvs_file_history_flatWidth1" value="294" />
+    <property name="cvs_file_history_treeWidth1" value="294" />
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="cvs_file_history_flatOrder2" value="2" />
-    <property name="cvs_file_history_treeWidth2" value="460" />
+    <property name="cvs_file_history_treeWidth2" value="294" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="cvs_file_history_flatOrder3" value="3" />
     <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
@@ -322,18 +330,124 @@
     <property name="cvs_file_history_treeOrder3" value="3" />
     <property name="last_opened_file_path" value="C:\spark\src\resources" />
     <property name="cvs_file_history_treeOrder2" value="2" />
-    <property name="cvs_file_history_treeWidth3" value="459" />
-    <property name="cvs_file_history_flatWidth0" value="460" />
-    <property name="cvs_file_history_flatWidth3" value="459" />
+    <property name="cvs_file_history_treeWidth3" value="293" />
+    <property name="cvs_file_history_flatWidth0" value="294" />
+    <property name="cvs_file_history_flatWidth3" value="293" />
     <property name="cvs_file_history_treeOrder0" value="0" />
   </component>
   <component name="ReadonlyStatusHandler">
     <option name="SHOW_DIALOG" value="true" />
   </component>
   <component name="RecentsManager" />
-  <component name="RestoreUpdateTree" />
+  <component name="RestoreUpdateTree">
+    <UpdateInfo date="9/7/06 6:04 PM" ActionInfo="Update">
+      <UpdatedFiles>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Updated from server" />
+          <option name="myStatusName" value="Changed on server" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="CHANGED_ON_SERVER" />
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Updated" />
+            <option name="myStatusName" value="Changed" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="false" />
+            <option name="myId" value="UPDATED" />
+            <PATH>C:\spark\documentation\README.html</PATH>
+            <PATH>C:\spark\documentation\LICENSE.html</PATH>
+            <PATH>C:\spark\documentation\changelog.html</PATH>
+          </FILE-GROUP>
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Created" />
+            <option name="myStatusName" value="Created" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="false" />
+            <option name="myId" value="CREATED" />
+          </FILE-GROUP>
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Deleted" />
+            <option name="myStatusName" value="Deleted" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="true" />
+            <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+            <PATH>C:\spark\documentation\install-guide.html</PATH>
+          </FILE-GROUP>
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Restored" />
+            <option name="myStatusName" value="Will be restored" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="false" />
+            <option name="myId" value="RESTORED" />
+          </FILE-GROUP>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Modified" />
+          <option name="myStatusName" value="Modified" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="MODIFIED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Merged with conflicts" />
+          <option name="myStatusName" value="Will be merged with conflicts" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="MERGED_WITH_CONFLICTS" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Merged" />
+          <option name="myStatusName" value="Will be merged" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="MERGED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Not in repository" />
+          <option name="myStatusName" value="Not in repository" />
+          <option name="mySupportsDeletion" value="true" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="UNKNOWN" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Locally added" />
+          <option name="myStatusName" value="Locally added" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="LOCALLY_ADDED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Locally removed" />
+          <option name="myStatusName" value="Locally removed" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="LOCALLY_REMOVED" />
+        </FILE-GROUP>
+      </UpdatedFiles>
+    </UpdateInfo>
+  </component>
   <component name="RunManager">
     <activeType name="Application" />
+    <tempConfiguration selected="false" default="false" name="Test" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" value="org.jivesoftware.Test" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <module name="Spark" />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+    </tempConfiguration>
+    <configuration selected="false" default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <module name="" />
+    </configuration>
     <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -350,22 +464,6 @@
         <value defaultName="wholeProject" />
       </option>
     </configuration>
-    <configuration selected="false" default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <module name="" />
-    </configuration>
-    <configuration selected="false" default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
     <configuration selected="false" default="true" type="Applet" factoryName="Applet">
       <module name="" />
       <option name="MAIN_CLASS_NAME" />
@@ -378,6 +476,13 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
     </configuration>
+    <configuration selected="false" default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
     <configuration selected="true" default="false" name="Spark" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" value="org.jivesoftware.Spark" />
       <option name="VM_PARAMETERS" value="-Dswing.aatext=true -XX:TargetSurvivorRatio=1 -Xverify:none -XX:PermSize=20M -Xmx96m -Xms96m" />
@@ -386,14 +491,31 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk1.6.0" />
       <module name="Spark" />
-      <RunnerSettings RunnerId="Run" />
       <RunnerSettings RunnerId="Debug">
         <option name="DEBUG_PORT" value="1406" />
         <option name="TRANSPORT" value="0" />
         <option name="LOCAL" value="true" />
       </RunnerSettings>
-      <ConfigurationWrapper RunnerId="Run" />
+      <RunnerSettings RunnerId="Run" />
       <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
+    </configuration>
+    <configuration selected="false" default="false" name="Fastpath" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" value="org.jivesoftware.Spark" />
+      <option name="VM_PARAMETERS" value="-Dplugin=C:\code\spark\plugins\fastpath\plugin.xml" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <module name="Fastpath" />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="1824" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
     </configuration>
   </component>
   <component name="SelectInManager" />
@@ -439,26 +561,26 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1928" height="1178" extended-state="0" />
-    <editor active="false" />
+    <frame x="-4" y="-4" width="1928" height="1178" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298731" order="7" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.21588486" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31809524" order="1" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32947975" order="7" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2249467" order="0" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3152381" order="1" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31904763" order="8" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.316763" order="8" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3990476" order="6" />
       <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32980457" order="3" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2657143" order="2" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2496" order="2" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.26285714" order="2" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24896552" order="2" />
       <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31333333" order="4" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.45619047" order="4" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2704762" order="8" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.26761904" order="8" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
       <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
@@ -488,16 +610,16 @@
     <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="Adding Debugger back." />
-    <MESSAGE value="Fixed npe in File Transfer." />
-    <MESSAGE value="Made messages waiting rooms not capable of becoming stale." />
-    <MESSAGE value="SPARK-315  &#9; More intelligent Growl support. (right now it gives you a growl notification for every message, whereas other clients tend to only give you notifications on conversations that you are not currently looking at)" />
-    <MESSAGE value="SPARK-208 Need to Fix VM params for 3D" />
-    <MESSAGE value="Fix NPE in ChatRoom" />
-    <MESSAGE value="Adding i18n." />
-    <MESSAGE value="Checking for beta 3." />
-    <MESSAGE value="Small Fastpath Fixes." />
-    <MESSAGE value="Fixed deadlock in file transfer." />
+    <MESSAGE value="Updating for 2.0 release." />
+    <MESSAGE value="Minor i18n fixes." />
+    <MESSAGE value="Fixed memory issue in ChatTranscripts." />
+    <MESSAGE value="Fixed wrong name in tab with alerts." />
+    <MESSAGE value="Small logging change." />
+    <MESSAGE value="Fix apple plugin preference issue." />
+    <MESSAGE value="Fixing busted preferences on Mac." />
+    <MESSAGE value="Updated changelog" />
+    <MESSAGE value="SPARK-341  &#9; Online installer needs a minimum JRE preference of 1.5&#10;SPARK-343  &#9; Spark does not handle upgrades with the online tag." />
+    <MESSAGE value="Properties change." />
   </component>
   <component name="VssConfiguration">
     <option name="CLIENT_PATH" value="" />
@@ -538,107 +660,107 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/search/ChatSearch.java">
+    <entry file="file://$PROJECT_DIR$/../../documentation/LICENSE.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="82" column="0" selection-start="2682" selection-end="2682" vertical-scroll-proportion="0.40606654">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/code/liveassistant/workgroup/source/com/jivesoftware/smack/workgroup/agent/AgentSession.java">
+    <entry file="file://$PROJECT_DIR$/../../documentation/changelog.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="525" column="0" selection-start="21630" selection-end="21630" vertical-scroll-proportion="0.21624266">
+        <state line="205" column="112" selection-start="7542" selection-end="7542" vertical-scroll-proportion="0.2919563">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/code/liveassistant/workgroup/source/com/jivesoftware/smack/workgroup/agent/TranscriptSearchManager.java">
+    <entry file="file://$PROJECT_DIR$/../../documentation/README.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="88" column="14" selection-start="3468" selection-end="3468" vertical-scroll-proportion="0.6888454">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/code/liveassistant/workgroup/source/com/jivesoftware/smack/workgroup/packet/TranscriptSearch.java">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="51" column="47" selection-start="1531" selection-end="1531" vertical-scroll-proportion="0.45107633">
+        <state line="609" column="0" selection-start="22335" selection-end="22335" vertical-scroll-proportion="0.82149714">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/../lib/dist/smack.jar!/org/jivesoftware/smack/util/StringUtils.class">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreferences.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="28" column="0" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.46575344">
+        <state line="16" column="21" selection-start="371" selection-end="371" vertical-scroll-proportion="0.16634052">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/code/spark/plugins/fastpath/build/lib/dist/workgroup.jar!/com/jivesoftware/smack/workgroup/agent/AgentSession.class">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="0" selection-start="3162" selection-end="3162" vertical-scroll-proportion="0.016881827">
+        <state line="96" column="17" selection-start="2497" selection-end="2497" vertical-scroll-proportion="0.35127202">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/panes/QueueItem.java">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Test.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="34" column="13" selection-start="835" selection-end="835" vertical-scroll-proportion="0.01663405">
+        <state line="15" column="19" selection-start="277" selection-end="277" vertical-scroll-proportion="0.24951077">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/panes/QueueActivity.java">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Installer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="53" column="41" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.01663405">
+        <state line="35" column="0" selection-start="1038" selection-end="1038" vertical-scroll-proportion="0.24031778">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/FastpathUI.java">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Uninstaller.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="49" column="24" selection-start="1508" selection-end="1508" vertical-scroll-proportion="0.56751466">
+        <state line="25" column="0" selection-start="640" selection-end="640" vertical-scroll-proportion="0.41585127">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactItem.java">
+    <entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/test.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="221" column="63" selection-start="6317" selection-end="6317" vertical-scroll-proportion="0.18297456">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ChatContainer.java">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="216" column="19" selection-start="7774" selection-end="7961" vertical-scroll-proportion="0.39921722">
+        <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="0.19960861">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java">
+    <entry file="file://$PROJECT_DIR$/../../src/resources/i18n/spark_i18n.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="142" column="51" selection-start="5604" selection-end="5604" vertical-scroll-proportion="0.2847358">
+        <state line="49" column="23" selection-start="1083" selection-end="1083" vertical-scroll-proportion="0.8150685">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ChatRoom.java">
+    <entry file="file://C:/code/spark/plugins/fastpath/src/resources/i18n/fastpath_i18n.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="313" column="8" selection-start="11318" selection-end="11318" vertical-scroll-proportion="0.4217221">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/MessageListener.java">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/MainWindowListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="31" column="0" selection-start="915" selection-end="915" vertical-scroll-proportion="0.5156556">
+        <state line="43" column="0" selection-start="1501" selection-end="1501" vertical-scroll-proportion="0.7152642">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../build.xml">
+    <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Spark.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="108" column="33" selection-start="4945" selection-end="4945" vertical-scroll-proportion="0.79843444">
+        <state line="141" column="73" selection-start="4578" selection-end="4578" vertical-scroll-proportion="0.41976517">
           <folding />
         </state>
       </provider>