Merge branch 'dev' of https://github.com/sleepwom/skynet into dev

Conflicts:
	skynet-src/skynet_server.c