Merge branch '300-tracks-for-trains' into 'develop'

IO/GeoFileParser.cpp

IO/GeoFileParser.h

IO/IODispatcher.cpp

IO/IniFileParser.cpp

Simulation.cpp

Simulation.h

geometry/Building.cpp

geometry/Building.h

geometry/Crossing.cpp

geometry/Line.cpp

geometry/Line.h

geometry/SubRoom.cpp

geometry/SubRoom.h

math/VelocityModel.cpp

routing/DirectionStrategy.cpp

routing/DirectionStrategy.h

routing/ff_router/UnivFFviaFM.cpp

routing/ff_router/ffRouter.cpp

routing/ff_router_trips/UnivFFviaFMTrips.cpp

routing/global_shortest/GlobalRouter.cpp