Merge branch 'feature/supporter' of https://github.com/ghostery/ghost…
b85cf3e
…ery-extension into feature/supporter
