Merge remote-tracking branch 'upstream/master'
pathfinding done
fix indentation
Merge branch 'master' of https://github.com/skrogh/02102