Merge remote-tracking branch 'origin/master'
made active links on the main navigation active when on a child page of that link