Zabbix

..F....... [ZBX-12603] updated to latest from trunk; resolved conflicts in:
- frontends/php/app/views/monitoring.dashboard.edit_form.php (new file name: frontends/php/app/views/dashbrd.properties.edit.php)
- frontends/php/include/classes/mvc/CRouter.php