Client-Server files are handled
consistent names for event types;
test bugs regarding quit state fixed;
Merge commit 'ed532a991a75107ceb749a2bce28b710fa4f697b' into develop