fixed encoding issue and leftover from before xml-merge
Merge branch 'master' of https://github.com/mvk-team42/Veracitor