merge commit

diff --cc utils/InstallAnywhere/Jalview.iap_xml
index 41ca030,ecd0306..d77a93b
--- 1/utils/InstallAnywhere/Jalview.iap_xml
--- 2/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@@ -1040,164 -1040,112 +1040,164 @@@ and any path to a file to save to the f
                                                        <property name="ruleExpression">
                                                                <string><![CDATA[]]></string>
                                                        </property>
 +                                              </object>                               
 +                                      </method>               
 +                                      <method name="addElement">
 +                                              <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="244fff00ffff">
 +                                                      <property name="belongsToUninstallPhase">
 +                                                              <boolean>false</boolean>
 +                                                      </property>
 +                                                      <property name="rollbackEnabledCancel">
 +                                                              <boolean>true</boolean>
 +                                                      </property>
 +                                                      <property name="rollbackEnabledError">
 +                                                              <boolean>true</boolean>
 +                                                      </property>
 +                                                      <property name="ruleExpression">
 +                                                              <string><![CDATA[]]></string>
 +                                                      </property>
 +                                                      <property name="unixPermissions">
 +                                                              <string><![CDATA[664]]></string>
 +                                                      </property>
 +                                                      <property name="sourceName">
 +                                                              <string><![CDATA[jsoup-1.8.1.jar]]></string>
 +                                                      </property>
 +                                                      <property name="overrideUnixPermissions">
 +                                                              <boolean>false</boolean>
 +                                                      </property>
 +                                                      <property name="sourcePath">
 +                                                              <string><![CDATA[/home/cruisecontrol/jalview/lib/]]></string>
 +                                                      </property>
 +                                                      <property name="shouldUninstall">
 +                                                              <boolean>true</boolean>
 +                                                      </property>
 +                                                      <property name="rollbackEnabledCancel">
 +                                                              <boolean>true</boolean>
 +                                                      </property>
 +                                                      <property name="rollbackEnabledError">
 +                                                              <boolean>true</boolean>
 +                                                      </property>
 +                                                      <property name="destinationName">
 +                                                              <string><![CDATA[jsoup-1.8.1.jar]]></string>
 +                                                      </property>
 +                                                      <property name="fileSize">
 +                                                              <long>348699</long>
 +                                                      </property>
 +                                                      <property name="macBinary">
 +                                                              <boolean>false</boolean>
 +                                                      </property>
 +                                                      <property name="targetCheckKind">
 +                                                              <int>0</int>
 +                                                      </property>
 +                                                      <property name="ruleExpression">
 +                                                              <string><![CDATA[]]></string>
 +                                                      </property>
                                                </object>
                                        </method>
-           <method name="addElement">
-             <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="244ffffaa672">
-               <property name="belongsToUninstallPhase">
-                 <boolean>false</boolean>
-               </property>
-               <property name="rollbackEnabledCancel">
-                 <boolean>true</boolean>
-               </property>
-               <property name="rollbackEnabledError">
-                 <boolean>true</boolean>
-               </property>
-               <property name="ruleExpression">
-                 <string><![CDATA[]]></string>
-               </property>
-               <property name="unixPermissions">
-                 <string><![CDATA[664]]></string>
-               </property>
-               <property name="sourceName">
-                 <string><![CDATA[log4j-to-slf4j-2.0-rc2.jar]]></string>
-               </property>
-               <property name="overrideUnixPermissions">
-                 <boolean>false</boolean>
-               </property>
-               <property name="sourcePath">
-                 <string><![CDATA[/home/cruisecontrol/jalview/lib/]]></string>
-               </property>
-               <property name="shouldUninstall">
-                 <boolean>true</boolean>
-               </property>
-               <property name="rollbackEnabledCancel">
-                 <boolean>true</boolean>
-               </property>
-               <property name="rollbackEnabledError">
-                 <boolean>true</boolean>
-               </property>
-               <property name="destinationName">
-                 <string><![CDATA[log4j-to-slf4j-2.0-rc2.jar]]></string>
-               </property>
-               <property name="fileSize">
-                 <long>348699</long>
-               </property>
-               <property name="macBinary">
-                 <boolean>false</boolean>
-               </property>
-               <property name="targetCheckKind">
-                 <int>0</int>
-               </property>
-               <property name="ruleExpression">
-                 <string><![CDATA[]]></string>
-               </property>
-             </object>
-           </method>
-           <method name="addElement">
-             <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="244f00faa672">
-               <property name="belongsToUninstallPhase">
-                 <boolean>false</boolean>
-               </property>
-               <property name="rollbackEnabledCancel">
-                 <boolean>true</boolean>
-               </property>
-               <property name="rollbackEnabledError">
-                 <boolean>true</boolean>
-               </property>
-               <property name="ruleExpression">
-                 <string><![CDATA[]]></string>
-               </property>
-               <property name="unixPermissions">
-                 <string><![CDATA[664]]></string>
-               </property>
-               <property name="sourceName">
-                 <string><![CDATA[slf4j-log4j12-1.7.7.jar]]></string>
-               </property>
-               <property name="overrideUnixPermissions">
-                 <boolean>false</boolean>
-               </property>
-               <property name="sourcePath">
-                 <string><![CDATA[/home/cruisecontrol/jalview/lib/]]></string>
-               </property>
-               <property name="shouldUninstall">
-                 <boolean>true</boolean>
-               </property>
-               <property name="rollbackEnabledCancel">
-                 <boolean>true</boolean>
-               </property>
-               <property name="rollbackEnabledError">
-                 <boolean>true</boolean>
-               </property>
-               <property name="destinationName">
-                 <string><![CDATA[slf4j-log4j12-1.7.7.jar]]></string>
-               </property>
-               <property name="fileSize">
-                 <long>348699</long>
-               </property>
-               <property name="macBinary">
-                 <boolean>false</boolean>
-               </property>
-               <property name="targetCheckKind">
-                 <int>0</int>
-               </property>
-               <property name="ruleExpression">
-                 <string><![CDATA[]]></string>
-               </property>
-             </object>
-           </method>
+                                       <method name="addElement">
+                                               <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="244ffffaa672">
+                                                       <property name="belongsToUninstallPhase">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledCancel">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledError">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="ruleExpression">
+                                                               <string><![CDATA[]]></string>
+                                                       </property>
+                                                       <property name="unixPermissions">
+                                                               <string><![CDATA[664]]></string>
+                                                       </property>
+                                                       <property name="sourceName">
+                                                               <string><![CDATA[log4j-to-slf4j-2.0-rc2.jar]]></string>
+                                                       </property>
+                                                       <property name="overrideUnixPermissions">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="sourcePath">
+                                                               <string><![CDATA[/home/cruisecontrol/jalview/lib/]]></string>
+                                                       </property>
+                                                       <property name="shouldUninstall">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledCancel">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledError">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="destinationName">
+                                                               <string><![CDATA[log4j-to-slf4j-2.0-rc2.jar]]></string>
+                                                       </property>
+                                                       <property name="fileSize">
+                                                               <long>348699</long>
+                                                       </property>
+                                                       <property name="macBinary">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="targetCheckKind">
+                                                               <int>0</int>
+                                                       </property>
+                                                       <property name="ruleExpression">
+                                                               <string><![CDATA[]]></string>
+                                                       </property>
+                                               </object>
+                                       </method>
+                                       <method name="addElement">
+                                               <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="244f00faa672">
+                                                       <property name="belongsToUninstallPhase">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledCancel">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledError">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="ruleExpression">
+                                                               <string><![CDATA[]]></string>
+                                                       </property>
+                                                       <property name="unixPermissions">
+                                                               <string><![CDATA[664]]></string>
+                                                       </property>
+                                                       <property name="sourceName">
+                                                               <string><![CDATA[slf4j-log4j12-1.7.7.jar]]></string>
+                                                       </property>
+                                                       <property name="overrideUnixPermissions">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="sourcePath">
+                                                               <string><![CDATA[/home/cruisecontrol/jalview/lib/]]></string>
+                                                       </property>
+                                                       <property name="shouldUninstall">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledCancel">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="rollbackEnabledError">
+                                                               <boolean>true</boolean>
+                                                       </property>
+                                                       <property name="destinationName">
+                                                               <string><![CDATA[slf4j-log4j12-1.7.7.jar]]></string>
+                                                       </property>
+                                                       <property name="fileSize">
+                                                               <long>348699</long>
+                                                       </property>
+                                                       <property name="macBinary">
+                                                               <boolean>false</boolean>
+                                                       </property>
+                                                       <property name="targetCheckKind">
+                                                               <int>0</int>
+                                                       </property>
+                                                       <property name="ruleExpression">
+                                                               <string><![CDATA[]]></string>
+                                                       </property>
+                                               </object>
+                                       </method>
                                        <method name="addElement">
                                                <object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="88d4aff3b0c6">
                                                        <property name="belongsToUninstallPhase">
@@@ -6237,9 -6324,8 +6376,11 @@@ and any path to a file to read from tha
                                                                                <object refID="24485f8aa671"/>
                                                                                <object refID="24485f89a672"/>
                                                                                <object refID="24485f8aa672"/>
 -                                                                              <object refID="244ffffaa672"/>
 -                                                                              <object refID="244f00faa672"/>
++
 +                                                                              <object refID="244fff00ffff"/>
-                     <object refID="244ffffaa672"/>
-                     <object refID="244f00faa672"/>
++                                                          <object refID="244ffffaa672"/>
++                                                          <object refID="244f00faa672"/>
++
                                                                                <object refID="24485f8ba672"/>
                                                                                <object refID="24485f8aa673"/>
                                                                                <object refID="24485f8ba673"/>
@@@ -6975,9 -7062,8 +7117,9 @@@
                                                                                                <object refID="24485f8aa671"/>
                                                                                                <object refID="24485f89a672"/>
                                                                                                <object refID="24485f8aa672"/>
 -                                                                                              <object refID="244ffffaa672"/>
 -                                                                                              <object refID="244f00faa672"/>
 +                                                                                              <object refID="244fff00ffff"/>
-                         <object refID="244ffffaa672"/>
-                         <object refID="244f00faa672"/>
++                                                                      <object refID="244ffffaa672"/>
++                                                                      <object refID="244f00faa672"/>
                                                                                                <object refID="24485f8ba672"/>
                                                                                                <object refID="24485f8aa673"/>
                                                                                                <object refID="24485f8ba673"/>