Merge branch 'feature/rewards-integration' of https://github.com/ghos… …
…tery/ghostery-extension into feature/rewards-integration