Zabbix

.......... [ZBXNEXT-2976] updated to latest from master

Resolved conflicts in:
	create/src/schema.tmpl
	create/src/templates.tmpl
	src/libs/zbxdbupgrade/dbupgrade_5030.c
	ui/app/controllers/CControllerLatest.php
	ui/app/controllers/CControllerPopupMassupdateItem.php
	ui/app/controllers/CControllerPopupMassupdateItemPrototype.php
	ui/app/views/popup.generic.php
	ui/app/views/popup.massupdate.item.php
	ui/include/classes/api/services/CDiscoveryRule.php
	ui/include/classes/api/services/CItem.php
	ui/include/classes/api/services/CItemGeneral.php
	ui/include/classes/api/services/CItemPrototype.php
	ui/include/classes/export/writers/CXmlExportWriter.php
	ui/include/classes/import/CConfigurationImport.php
	ui/include/classes/import/CImportDataAdapter.php
	ui/include/classes/import/converters/C52ImportConverter.php
	ui/include/defines.inc.php
	ui/include/forms.inc.php
	ui/include/items.inc.php
	ui/include/schema.inc.php
	ui/items.php