Route OK
Merge remote-tracking branch 'origin/master'

Conflicts:
	intprog_project/WebContent/map.jsp
Route OK, Hoppande OK, dagslista OK