CHOICEFUNCT :)
gps and resupply now boolean.
Added Info for GPS mode in Menu.
removed obsolete comment
Merge remote-tracking branch 'upstream/master'

Conflicts:
	shape.lua