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

Merge branch 'master' of https://github.com/tnason/CoE1186
fix scheduler
do merge

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