Cleaned up the git
Initial commit for the GUI devel branch
Cleaned up Git
Merge branch 'gui_dev'