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

Conflicts:
	QTrainSim/entrydialog.h
Wczytywanie mapy w Qt
Gui

Conflicts:
	QTrainSim/mainwindow.cpp
x
Merge branch 'master' of https://github.com/rideofyourlife/TrainSim
Merge branch 'core-project'