Merge remote-tracking branch 'origin/ellipsize'
Merge branch 'master' of github.com:coyotebush/sthlm-next-android
Add map markers. Minor change to ResRobotAPI's findStationsNear() return value