partial poi
partial poi
partial poi
Merge remote-tracking branch 'origin/integratedCode' into integratedCode

Conflicts:
	main/dataModel/gps.py
	main/webUi/page2.py
	main/webUi/page2Components/poi.py