gui
Merge branch 'master' into Share
Revert "GUI Vers2"

This reverts commit 9a907ebc16561c80c31bd679a91a3e98c137c77a.