C: Change Active Menu and Logo
Merge branch 'master' into production