.......... [ZBX-8157] updated to latest from trunk
A......... [ZBX-8193] added changes to database template and frontend