Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

 interface/web/help/lib/lang/el_help_faq_list.lng

@@ -1,4 +1,3 @@
<?php
$wb['edit_txt'] = 'Edit';
?>