Merge branch 'release/0.4'
Merge branch 'release/0.5'
Merge branch 'release/0.6'
Forgot to change layout on one view. Fixes issue #84
Merge branch 'hotfix/settingsyield' into dev