Merge pull request #26 from semioticrobotic/feature/GEODE-4063 GEODE-4063: Update trademarks on website