[TESTING] Close #15

Signed-off-by: hennors <e-fowl@gmx.de>
Merge branch 'testing' of github.com:mangoszero/server into testing