Wrapped the gui in the client. Try to simplify the client uses...
Merge branch 'guiWrappedInClient' into develop