Merge remote-tracking branch 'origin/Dennis'
serversocket implemented
fixed merge conflicts
fixed some stuff in eyecall aid
Merge remote-tracking branch 'origin/master' into Dennis