fixes to the navigation and url dispatcher and calls in html files
Merge branch 'master' of github.com:Stringsy/team-project