Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-13 43418672d32ee65ee6060314d4e66c3c44a8b0cb

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

@@ -3,4 +3,6 @@
$wb['language_select_txt'] = 'Select language';
$wb['module_txt'] = 'Module';
$wb['lang_file_txt'] = 'Language file';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Back';
?>