got rid of old pathfinding
Merge branch 'master' into localpathfinding

Conflicts:
	TrainSystemProject/src/PathFinder.java
Merge remote-tracking branch 'origin/localpathfinding'
updating