json instead xml, fileTypes and other changes
Merge branch 'develop'