updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

1
2
3
4
5
<?php
$wb['description_txt'] = 'Description';
$wb['name_txt'] = 'Group';
$wb['name_err'] = 'Group must be min 1, max 30 Chars.';
?>