Merge branch 'master', remote-tracking branch 'origin' into hoos
adding linux-compatible gui
adding linux-compatible gui