Merge branch 'development' into settings-jobs-design
Design for settings. Fixes #600
Merge branch 'settings-jobs-design' of https://github.com/peerlibrary/peerlibrary into settings-jobs-design