delete trip.trips.xml
Merge remote-tracking branch 'origin/Jiayi'
Merge remote-tracking branch 'origin/master' into Jiayi1
Running python script support added.
Merge remote-tracking branch 'origin/master' into Jiayi1
SimulationScreen class enhanced
Merge remote-tracking branch 'origin/master' into Jiayi1
Change to TabbedPane