GUI and Controller comments updated
Merge branch 'master' of https://github.com/tgm-swortha/A12.git