apk
Merge branch 'master' of https://github.com/reidHoruff/RTBus
stop subscriptions
Merge branch 'master' of https://github.com/reidHoruff/RTBus
merge
minor changes and added stop id
added stop id
Merge branch 'master' of https://github.com/reidHoruff/RTBus
Merge remote-tracking branch 'upstream/master'

Conflicts:
	android/app/src/main/java/com/foobar/app/BusStop.java
	android/app/src/main/java/com/foobar/app/SettingsActivity.java
	android/app/src/main/java/com/foobar/app/StopSubscription.java