refs #2702: removed todos as we already solve this issue
Merge branch 'develop' of https://github.com/eu-osha/osha-website into develop