Zabbix

.......... [ZBXNEXT-3006] updated to the latest trunk; fixed conflicts in:


- create/src/data.tmpl
- create/src/schema.tmpl
- frontends/php/include/defines.inc.php
- frontends/php/items.php
- frontends/php/js/init.js