update gui controls to CTC
merge conflicts in track module
Merge branch 'master' of https://github.com/tnason/CoE1186

merge to latest