Gui overall changes
Merge branch 'master' of https://github.com/rideofyourlife/TrainSim

Conflicts:
	QTrainSim/entrydialog.h
Gui

Conflicts:
	QTrainSim/mainwindow.cpp