Added the updateInfoWindow function to mainwindow.cpp.
Merge branch 'master' into MainUI
"Merging the latest from master into MainUI"