Jleithart snapshot day prep

All my updates from snapshot day.

I can't upload the new APK to the google play listing. So, I need to talk to Aziz about that.