Batch merged into activity
Merge branch 'master' of https://github.com/Maocx/PenO3-BikeBuddy