Merge branch 'master_fixes' into 'master'

Till Brehm

2014-03-26 deb3716e433556f4d259a98ac3969169d11d779a

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

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