Merge branch 'master', remote-tracking branch 'origin/master'
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'dev', remote-tracking branch 'origin/dev'
Merge branch 'master', remote-tracking branch 'origin/master'
file icon fix
stoof?
Resolves conflicts
Adds dates to table headers and extends calendars timeframe to 23.
Adds dates to the calendars and handling of the exception in case of weekbase calendar
Changes the index page to show 5 pieces of news instead of just 3