Edited JourneyPlanner & MaintenanceNews
Merge branch 'master' of https://github.com/the-eejay/TranslinkMobile

Conflicts:
	AndroidManifest.xml
	src/transponders/translinkmobile/NearbyStops.java