Fix import issues due to changes in stations id and folders structure
remove commented line
solving conflicts'
Merge remote-tracking branch 'upstream/speed_optimization' into solve_conflicts
Merge pull request #12 from monodo/solve_conflicts

Solve conflicts