Added Client GUI
Merge origin/master
Added Client GUI