Zabbix

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

#	sass/stylesheets/sass/screen.scss
#	ui/app/partials/monitoring.host.filter.php
#	ui/app/partials/monitoring.latest.filter.php
#	ui/app/partials/monitoring.problem.filter.php
#	ui/app/views/popup.media.php
#	ui/assets/styles/blue-theme.css
#	ui/assets/styles/dark-theme.css
#	ui/assets/styles/hc-dark.css
#	ui/assets/styles/hc-light.css