xml and json data

data is ready for import
updates

did json wrong
Merge branch 'master' into gh-pages