updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

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

@@ -8,3 +8,4 @@
$wb['groups_txt'] = 'Skupiny';
?>