GUI

GUI
GUI update
update
Merge remote-tracking branch 'origin/GUI' into Voce-Dev