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/editwebpage.php

@@ -32,7 +32,7 @@ function editwebpage_content(&$a) {
 
 	$which = argv(1);
 
-	$uid = local_user();
+	$uid = local_channel();
 	$owner = 0;
 	$channel = null;
 	$observer = $a->get_observer();