updated server files
Merge branch 'master' of github.com:cosmin1123/ImagineCupGame