Merge branch 'master' of https://github.com/rideofyourlife/TrainSim
little gui changes