Import from XML now escapes apostrophes using the html code &039;
Merge branch 'sosi-editor' of https://github.com/willzeng/WikiNets into sosi-editor