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

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb
index 339add5a9..61c8f92c1 100644
--- a/doc/addons_gnusocial.bb
+++ b/doc/addons_gnusocial.bb
@@ -10,7 +10,7 @@ Next, click the link to Register a new application. That brings up the new appli
 
 Icon. I uploaded the RedMatrix icon located at this link, after saving it to my computer:
 
-https://github.com/friendica/red/blob/master/images/rm-32.png
+https://github.com/redmatrix/redmatrix/blob/master/images/rm-32.png
 
 Name. Give the application an appropriate name. I called mine redmatrix. You might prefer r2g.