pre-merge commit
Merge branch 'master' of https://github.com/bsanders/softeng
additional gui fixes