Update server fix some errors
Merge branch 'master' of github.com:Aldegran/space