Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME

Conflicts (resolved):
	lng/english.lng.php
	lng/german.lng.php

scripts/classes/class.HttpConfigBase.php

@@ -29,7 +29,7 @@ class HttpConfigBase {
 			'CUSTOMER' => $domain['loginname'],
 			'IP' => $ip,
 			'PORT' => $port,
-			'IS_SSL' => ($is_ssl_vhost)?'ssl':'',
+			'SCHEME' => ($is_ssl_vhost)?'https':'http',
 			'DOCROOT' => $domain['documentroot']
 		);
 		return replace_variables($template, $templateVars);