Added timeout setting and change version of zabbix_agent
Merge branch 'master' of github.com:laradji/zabbix