Server refacto
Merge branch 'develop' of github.com:Gameo/curvytron into develop