Fix Makefile. Modify server.
Merge branch 'master' of https://github.com/cjwind/toolkit