Fixes CW-598 - Update for date & timezone settings
Merge branch 'sprint-4' of github.com:/eu-osha/osha-website into sprint-4