Merge branch 'hotfix/broken-navigation'
Merge remote-tracking branch 'origin/develop'
Merge branch 'develop'
Updated composer.json

Fixing package to install properly from Composer
More changes to composer.json in the vain hope that it will somehow work.