ShipMove NOT FINISHED
Merge remote-tracking branch 'origin/master'

Conflicts:
	Goudkoorts/Modeling_Goudkoorts/ModelDefinition/Modeling_Goudkoorts.uml
	Goudkoorts/Modeling_Goudkoorts/Modeling_Goudkoorts.modelproj