DATA-2105
Fixed duplicated keys and added pre tags
Fixed non utf-8 characters
Merge pull request #120 from vincent-lhote/master

DATA-2105