cleaning up
Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/Navigation/main.cpp