Build script update
Navbar fixes
Merge branch 'master' of https://github.com/ChristianWeyer/UG-ngDemo