GUI changes
do merge

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

Merge branch 'master' of https://github.com/tnason/CoE1186
added functionality to CTC Gui
do merge

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