Add stopid to each prediction for easier merging with alarms branch
Add gradle.properties
Fix merge conflict
Fix merge conflicts
Merge branch 'master' into mta