Merge branch 'master' into tres

Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php

mod/admin.php

@@ -289,7 +289,7 @@ function admin_page_site_post(&$a){
 	}
 	else {
 		require_once('include/text.php');
-		linkify_tags($a, $admininfo, local_user());
+		linkify_tags($a, $admininfo, local_channel());
 		set_config('system','admininfo', $admininfo);
 	}
 	set_config('system','language', $language);