patch
Merge branch 'master' of github.com:ayzz/zappy
port
Merge branch 'master' of github.com:ayzz/zappy

Conflicts:
	Server/src/handler_zgp.c
	Server/src/server.c
poatch