Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 accfcafdae46cfc1cc5567ee111c63dc223b6c8e

 interface/lib/config.inc.php

@@ -139,6 +139,7 @@
//** Default Language
$conf['language'] = 'en';
$conf['debug_language'] = false;
$conf['language_file_import_enabled'] = true; // Bool value: true / false

//** Default Country
$conf['country'] = 'DE';