Convert xml to json
Convert json to xml
Merge branch 'master' of https://github.com/LukeAskew/grunt-atlas

* 'master' of https://github.com/LukeAskew/grunt-atlas:
  Convert xml to json

Conflicts:
	Gruntfile.js
	tasks/atlas.js
	templates/sitemap.json
	templates/sitemap.xml