merge requests conflicts resolved.

tests/testvar.jet

@@ -1,15 +1,14 @@
 #!../jet-2.0
- <set name="ix" value="1" />
+<set name="ix" value="1" />
 <set name="letterx" value="x" />
 <set name="var$[ix]" value="this is a test $[ix]" />
 <set name="1var1" value="This is another test" />
 <set name="var1var" value="Yet another test" />
 <set name="var11" value="it seems to work." />
-$[$[ix]var$[ix]]
+$[$[ix]var$[ix];binary]
 $[var$[ix]]
 $[var$[ix]var]
 $[var$[i$[letterx]]var]
 $[letterx;TOHEX]
 $[var$[i$[letterx]]$[ix]]
 $[var$[i$[letterx]]$[i$[letterx]]]
-