Iteration 2 - refactoring of moveUnit-method
Merge remote-tracking branch 'origin/iteration3' into iteration3