little changes
Merge branch 'master' of https://github.com/degoldcode/NaviSim

Conflicts:
	data/plotscr/pin.plot
	main.cpp
	navicontrol.cpp
	navicontrol.h
	routelearning.cpp