basic gui (main-view, no dialogs)
Merge remote-tracking branch 'origin/master'