Merge pull request #1 from wraith321/develop

server Anderung
Merge pull request #2 from wraith321/develop

req2
e-spawn
Merge pull request #18 from Wtomo/develop

e-spawn