In the process of updating navigation to use a "state machine"
architecture
Merge remote-tracking branch 'origin/GNav' into GNav

Conflicts:
	GPSCarHUD/bin/GPSCarHUD.apk
	GPSCarHUD/bin/classes.dex
	GPSCarHUD/bin/classes/com/uml/gpscarhud/HUDActivity$1.class
	GPSCarHUD/bin/classes/com/uml/gpscarhud/HUDActivity$2.class
	GPSCarHUD/bin/classes/com/uml/gpscarhud/HUDActivity$3.class
	GPSCarHUD/bin/classes/com/uml/gpscarhud/HUDActivity$4.class
	GPSCarHUD/bin/classes/com/uml/gpscarhud/HUDActivity.class
	GPSCarHUD/bin/classes/com/uml/gpscarhud/views/InstructionView.class
	GPSCarHUD/bin/resources.ap_
Merge remote-tracking branch 'origin/GNav' into GNav
Merged code and resolved conflicts