Fix merge xquery (#188)

* remove unused parameter

* use variable in text output

* add missing parameters

modules/merge/merge.xq

@@ -57,6 +57,8 @@ let $params :=
    <param name="hostname" value="{request:get-header('HOST')}"/>
    <param name="language" value="{$language}"/>
    <param name="score" value="{$score}"/>
+   <param name="app-root" value="{$config:app-root}"/>
+   <param name="data-root" value="{$config:data-root}"/>
 </parameters>
 
 let $list := loop:getlist($database,$coll,$genre,$query)

modules/merge/merge_settings.xq

@@ -50,7 +50,7 @@ let $formpage :=
 	      <input type="text" value="{$query}" name="query" style="width: 30em;"/><br/>&#160; 
 	      </p>
 	      <p><strong>eXist database</strong><br/>
-	      The collection /db/apps/mermeid/data/ is where MerMEId stores your files by default. /db/apps/mermeid/data-public/ usually 
+	      The collection {$database} is where MerMEId stores your files by default. {$database} usually 
 	      contains the files you have published with MerMEId.<br/>
 	      <input type="text" value="{$database}" name="db" style="width: 30em;"/><br/>&#160; 
 	      </p>

style/mei_to_html.xsl

@@ -22,7 +22,6 @@
 
 	<xsl:strip-space elements="*"/>
 
-	<xsl:param name="doc"/>
 	<xsl:param name="app-root"/>
 	<xsl:param name="data-root"/>
 	<xsl:param name="language"/>