fixed navbar javascript was out of place needed to adjust all templates
Merge branch 'hotfix/fix_navbar_collapse'