Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

 interface/web/tools/lib/lang/cz_tpl_default.lng

@@ -6,3 +6,4 @@
$wb['btn_cancel_txt'] = 'Zpět';
?>