Fix gzserver
Remove server module
Merge branch 'develop'