Soldiers attack, Inactive obejcts are removed

Also added location indicators and moved map.cs