Added support for multiple trains in TrainControllerUI
Merge origin/master