Backlog of changes on production server
Merge branch 'master' of git://github.com/DAVKronos/Kronos-Website