Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php

mod/match.php

@@ -51,7 +51,7 @@ function match_content(&$a) {
 				
 				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
 				$o .= replace_macros($tpl,array(
-					'$url' => $jj->url,
+					'$url' => zrl($jj->url),
 					'$name' => $jj->name,
 					'$photo' => $jj->photo,
 					'$inttxt' => ' ' . t('is interested in:'),