Fixed ship navmesh
Temporary fixed GUISelected weapon bug (so you can play again without spamming errors)
Merge branch 'refs/heads/master' into alex
Merge branch 'refs/heads/master' into alex

Conflicts:
	Assets/TestProject/Scripts/GUI/HUD/GUISelectedWeapon.cs