Zabbix

..F....... [ZBXNEXT-5287] updated to latest from master

Resolved conflicts in:
	frontends/php/app/views/popup.preproctestedit.view.js.php
	frontends/php/assets/styles/blue-theme.css
	frontends/php/assets/styles/dark-theme.css
	frontends/php/assets/styles/hc-dark.css
	frontends/php/assets/styles/hc-light.css
	frontends/php/include/classes/mvc/CRouter.php
	sass/stylesheets/sass/screen.scss