Changes to movement calculator regarding enemy units
Merge origin/master