Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 b3e7785b3ab5ea70675e0d944b3a746464c4143f

 interface/web/admin/lib/lang/cz_server.lng

@@ -13,3 +13,5 @@
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>