Merge pull request #2 from danielfoord/develop

update
Added new GUI for server