added encoding to the output tag in xslt
Merge branch 'newdev' into edina