fixing a typo in the server
Merge remote-tracking branch 'origin/dev'