Merge branch 'feature/78-refactor-settings' into develop
Merge branch 'develop' into staging