Calendar instead of Date and Author removed from article
Merge branch 'master' of https://github.com/ehannes/webapp.git