Gui bug fixes
Git made me commit again, so look at previous commit message
Merge branch 'master' of https://github.com/bsanders/softeng
had to get rid of virtualizing wrap panel
Merge branch 'master' of https://github.com/bsanders/softeng