bug fixes in CTC and Environment
do Merge
Merge branch 'master' of https://github.com/tnason/CoE1186
Fixed getTemp/setTemp
do merge

Merge branch 'master' of https://github.com/tnason/CoE1186
Re-added getTrainList
fix scheduler
Removed space
do merge

Merge branch 'master' of https://github.com/tnason/CoE1186
conflict