Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 interface/web/sites/lib/lang/en_web_folder_user_list.lng

@@ -3,4 +3,5 @@
$wb["active_txt"] = 'Active';
$wb["web_folder_id_txt"] = 'Folder';
$wb["username_txt"] = 'Username';
$wb["add_new_record_txt"] = 'Add new Folder User';
?>