nav menu consistent across all pages
hopefully resolved
conflicts resolved 1st round
added map and fixed nav buttons
Merge branch 'master' into alan
resolve conflicts alan