Merge branch 'Release/MileStone3/feature/timeout' into Release/MileStone3/debug

Conflicts:
	TeamNabf/NabfAgentLogic/AgentTypes.fs
	TeamNabf/NabfAgentLogic/Planning.fs
Merge branch 'Release/MileStone3/debug' of https://github.com/srnjcbsn/Beduin into Release/MileStone3/debug

Conflicts:
	TeamNabf/NabfAgentLogic/AgentTypes.fs
	TeamNabf/NabfAgentLogic/Planning.fs