New maps
New timetable files
Merge branch 'master' of
https://github.com/smartcampuslab/smartcampus.vas.journeyplanner.android.git

Conflicts:
	AndroidManifest.xml