FIXED: typo in logo name; error in JS caused by bad merge.
Merge branch 'master' into front-end