encoding fix - text files now UTF8
Merge branch 'master' into encodingfix