Merge everything

This should be just about everything.

Included is a signed APK (signed by me) which if that's what you want, it can be released.

Joe :cat: