Zabbix

.......... [DEV-2299] updated to latest master; conflicts resolved in:

#	sass/stylesheets/sass/components/dashboard/_dashboard.scss
#	sass/stylesheets/sass/screen.scss
#	ui/assets/styles/blue-theme.css
#	ui/assets/styles/dark-theme.css
#	ui/assets/styles/hc-dark.css
#	ui/assets/styles/hc-light.css
#	ui/include/actions.inc.php
#	ui/include/classes/html/CTabFilter.php
#	ui/include/classes/screens/CScreenProblem.php
#	ui/include/defines.inc.php
#	ui/include/html.inc.php
#	ui/include/views/js/monitoring.sysmaps.js.php
#	ui/js/macrovalue.js
#	ui/widgets/problems/views/widget.view.php