changed serial ids of a couple of things, implemented locks in server methods and did some other stuff... aaw, fuck it, I am sicj and tired of these bloody commit messages, I don't remember what the hell I didfirefox &
Merge branch 'master' of github.com:propra13-orga/gruppe13