Merge branch 'release/database'
Merge branch 'release/db-test'
Merge branch 'release/views'
Merge branch 'release/db-view-fixes'
Removed superfluous 'if true' from cadet view
Merge branch 'hotfix/cadet-view-fix' into develop