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

Conflicts:
	Server/include/server.h
	Server/tags