Improve device adjustments
Merge branch 'master' of github.com:gittex/Zabbix-Reporter

Conflicts:
	share/tpl/list_triggers.tpl