Gui dev

Merge branch GUI-Dev to master