Lots of stuff
Merge branch 'master' of https://github.com/Hyperactivity/android-app