fixed menu bar active page handling
Merge branch 'master' into gh_projects