changes tags
Merge branch 'master' into work
Merge branch 'master' into work
formats pages show and index date
Merge branch 'work'
Merge pull request #113 from lisavogtsf/lisa

formats date and time on pages index and show