Merge branch 'breaking_point' of github.com:SimonEbner/ba into breaking_point
Merge branch 'breaking_point' into nav_test