Add stopid to each prediction for easier merging with alarms branch
Add gradle.properties
Add keyalias
Merge branch 'master' into la
Update keyalias