Show encoding of project files, when we abort the merge because they are different.
FIX add missing import for codecs
Workaround for different encoding names in Nexstep and XML format

Currently only works for UTF-8