mapactivitiy: draw current track/route
Merge branch 'master' of https://github.com/g-mac/AdamWest

Conflicts:
	app/src/main/java/de/adamwest/holiday/MapActivity.java