stuff
*renamed s to inputState to avoid problems

*fixed a few bugs related to the above

*sentinels now parry if enemies are on their node when doing occupy jobs
Merge branch 'Agent/Intentions/dev' of https://github.com/srnjcbsn/Beduin into Release/MileStone2/debug

Conflicts:
	TeamNabf/NabfAgentLogic/logic/Common.fs
	TeamNabf/NabfAgentLogic/logic/Explorer.fs
	TeamNabf/NabfAgentLogic/logic/Sentinel.fs