- added new merge xsl working with wrapper elements around template and import data
- fixed various details