New Greek merchant ship. Model is not final though.

This was SVN commit r8475.

binaries/data/mods/public/art/actors/props/structures/hellenes/merchantship_sail.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="mesh">
+      <mesh>props/kyrenia_sail.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="sail-pegasus">
+      <texture>structural/hele_sail_pegasus.dds</texture>
+    </variant>
+    <variant frequency="1" name="sail-krater">
+      <texture>structural/hele_sail_krater.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>

binaries/data/mods/public/art/actors/structures/hellenes/merchant_new.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/hele_kyrenia.dae</mesh>
+      <props>
+        <prop actor="props/structures/hellenes/merchantship_sail.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/kyrenia.dds</texture>
+    </variant>
+  </group>
+</actor>

binaries/data/mods/public/simulation/templates/units/hele_ship_merchant.xml

@@ -7,6 +7,13 @@
     <Icon>units/hele_ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>structures/hellenes/merchant.xml</Actor>
+    <Actor>structures/hellenes/merchant_new.xml</Actor>
   </VisualActor>
+  <Footprint replace="">
+    <Square width="8.0" depth="24.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Unit radius="6.0"/>
+  </Obstruction>
 </Entity>