Merge branch 'feature/update-android' of github.com:IAmThePan/ghoster… …
…y-extension into feature/update-android