Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

include/group.php

@@ -253,7 +253,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 		'text' 	=> t('All Channels'),
 		'id' => 0,
 		'selected' => (($group_id == 0) ? 'group-selected' : ''),
-		'href' 	=> $every,
+		'href' 	=> $every . (($every === 'network') ? '?f=&gid=0' : ''),
 	);
 
 
@@ -296,7 +296,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 	$o = replace_macros($tpl, array(
 		'$title'		=> t('Collections'),
 		'$edittext'     => t('Edit collection'),
-		'$createtext' 	=> t('Create a new collection'),
+		'$createtext' 	=> t('Add new collection'),
 		'$ungrouped'    => (($every === 'contacts') ? t('Channels not in any collection') : ''),
 		'$groups'		=> $groups,
 		'$add'			=> t('add'),