Merge pull request #3660 from nutty898/Merge_GUI_to_Develop

Merge gui to develop