json instead xml, fileTypes and other changes
Merge branch 'develop'
Merge remote-tracking branch 'upstream/master' into gh-pages
removed unused files
Merge branch 'develop'
preupdate
Merge remote-tracking branch 'upstream/master' into gh-pages
removed unused files
added prefix in FS
Merge branch 'develop'
Merge remote-tracking branch 'upstream/master' into gh-pages