XML, LocalStorage and JSON now working
Merge branch 'master' into gh-pages