Beware, this commit does not compile.
Merge branch 'master' of https://github.com/martin-ohlin/VaxjoBicycleGuide

Conflicts:
	app/src/main/java/com/martin/vaxjobicycleguide/RouteListFragment.java
Does not compile.