Fix zlib search.
Merge branch 'master' of git://github.com/yangacer/agent

Conflicts:
	CMakeLists.txt