Features/114 view xml

Fixed a bug in XmlFileViewAction and re-commit the changes from feature/view-xml.