fixed a comparison in Server
Merge branch 'master' of https://github.com/Neoba/Prototype