Made app less crash
Merge branch 'master' of github.com:elliottsj/transit-watch

Conflicts:
	android/app/src/main/AndroidManifest.xml
	android/app/src/main/res/values/strings.xml