Fixed compile error in server
Merge branch 'master' of https://github.com/mks65-dw/final
Merge branch 'master' of https://github.com/mks65-dw/final