Update atom.xml
Merge branch 'master' into gh-pages