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/what_is_zot.bb b/doc/what_is_zot.bb
index 67c0159e3..5dce2cb6f 100644
--- a/doc/what_is_zot.bb
+++ b/doc/what_is_zot.bb
@@ -55,7 +55,7 @@ For more detailed, technical information about Zot, check out the following link
 

  - [url=https://github.com/friendica/red/wiki/zot]Zot development specification[/url]

 

- - [url=https://github.com/friendica/red/blob/master/include/zot.php]Zot reference implementation in PHP[/url]

+ - [url=https://github.com/redmatrix/redmatrix/blob/master/include/zot.php]Zot reference implementation in PHP[/url]

 

 

 #include doc/macros/main_footer.bb;