Simplified tactic code
Moved all updating into the tactic
Refined tactic and strategy code
Base for DevShortTerm
Merge branch 'Dev_Shortterm' into Develop

Conflicts:
	bin/.gitignore