Merge branch 'hotfix/v1.0' into develop
Fixed navigation!
Merge branch 'release/v2.0'