Adding Andrew Schultz to the site credits.
Refactoring entry display.
Merge branch 'dev'