article display changes
Merge branch 'master' of https://github.com/rocho02/konferencia