Fake stops!
Merge branch 'master' of https://github.com/elliottsj/transit-watch

Conflicts:
	android/app/src/main/AndroidManifest.xml
	android/app/src/main/java/ca/cryptr/transit_watch/activities/StopsActivity.java

	modified:   android/app/src/main/AndroidManifest.xml
	modified:   android/app/src/main/java/ca/cryptr/transit_watch/activities/StopsActivity.java