Merge frontend changes

This merge request merges both branches with changes in the frontend

added 8 commits

• 679b6e11...7daf2872 - 7 commits from branch frontend_login
• d5f51288 - Merge branch 'frontend_login' into 'frontend_additional_info'

Compare with previous version

By Geert Habben Jansen on 2018-05-14T08:06:32 (imported from GitLab project)

merged

By Geert Habben Jansen on 2018-05-14T08:06:57 (imported from GitLab project)

mentioned in commit fd489da1

By Geert Habben Jansen on 2018-05-14T08:06:57 (imported from GitLab project)