Add RSS to html; Add tags for Atom
Merge branch 'fix-rsstags' into develop
Merge branch 'develop'