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, 0 insertions, 64 deletions

diff --git a/doc/html/hierarchy.js b/doc/html/hierarchy.js
deleted file mode 100644
index 83fcb9ea8..000000000
--- a/doc/html/hierarchy.js
+++ /dev/null
@@ -1,64 +0,0 @@
-var hierarchy =
-[
-    [ "AbstractBasic", null, [
-      [ "RedMatrix\\RedDAV\\RedBasicAuth", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html", null ]
-    ] ],
-    [ "App", "classApp.html", null ],
-    [ "BaseObject", "classBaseObject.html", [
-      [ "Conversation", "classConversation.html", null ],
-      [ "Item", "classItem.html", null ]
-    ] ],
-    [ "Cache", "classCache.html", null ],
-    [ "dba_driver", "classdba__driver.html", [
-      [ "dba_mysql", "classdba__mysql.html", null ],
-      [ "dba_mysqli", "classdba__mysqli.html", null ],
-      [ "dba_postgres", "classdba__postgres.html", null ]
-    ] ],
-    [ "enotify", "classenotify.html", null ],
-    [ "ICollection", null, [
-      [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ]
-    ] ],
-    [ "IFile", null, [
-      [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ]
-    ] ],
-    [ "RedMatrix\\Import\\Import", "classRedMatrix_1_1Import_1_1Import.html", null ],
-    [ "IQuota", null, [
-      [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ]
-    ] ],
-    [ "ITemplateEngine", "interfaceITemplateEngine.html", [
-      [ "FriendicaSmartyEngine", "classFriendicaSmartyEngine.html", null ],
-      [ "Template", "classTemplate.html", null ]
-    ] ],
-    [ "Node", null, [
-      [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ],
-      [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ]
-    ] ],
-    [ "OAuthDataStore", null, [
-      [ "FKOAuthDataStore", "classFKOAuthDataStore.html", null ]
-    ] ],
-    [ "OAuthServer", null, [
-      [ "FKOAuth1", "classFKOAuth1.html", null ]
-    ] ],
-    [ "photo_driver", "classphoto__driver.html", [
-      [ "photo_gd", "classphoto__gd.html", null ],
-      [ "photo_imagick", "classphoto__imagick.html", null ]
-    ] ],
-    [ "Plugin", null, [
-      [ "RedMatrix\\RedDAV\\RedBrowser", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html", null ]
-    ] ],
-    [ "ProtoDriver", "classProtoDriver.html", [
-      [ "ZotDriver", "classZotDriver.html", null ]
-    ] ],
-    [ "Sabre", null, [
-      [ "RedMatrix\\RedDAV\\RedBasicAuth", "classRedMatrix_1_1RedDAV_1_1RedBasicAuth.html", null ],
-      [ "RedMatrix\\RedDAV\\RedBrowser", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html", null ],
-      [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ],
-      [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ],
-      [ "RedMatrix\\RedDAV\\RedDirectory", "classRedMatrix_1_1RedDAV_1_1RedDirectory.html", null ],
-      [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ],
-      [ "RedMatrix\\RedDAV\\RedFile", "classRedMatrix_1_1RedDAV_1_1RedFile.html", null ]
-    ] ],
-    [ "Smarty", null, [
-      [ "FriendicaSmarty", "classFriendicaSmarty.html", null ]
-    ] ]
-];
\ No newline at end of file