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