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, 30 deletions

diff --git a/doc/html/annotated.js b/doc/html/annotated.js
deleted file mode 100644
index 3e28eeacf..000000000
--- a/doc/html/annotated.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var annotated =
-[
-    [ "acl_selectors", "namespaceacl__selectors.html", null ],
-    [ "Friendica", "namespaceFriendica.html", null ],
-    [ "friendica-to-smarty-tpl", "namespacefriendica-to-smarty-tpl.html", null ],
-    [ "RedMatrix", "namespaceRedMatrix.html", "namespaceRedMatrix" ],
-    [ "updatetpl", "namespaceupdatetpl.html", null ],
-    [ "util", "namespaceutil.html", null ],
-    [ "App", "classApp.html", "classApp" ],
-    [ "BaseObject", "classBaseObject.html", "classBaseObject" ],
-    [ "Cache", "classCache.html", null ],
-    [ "Conversation", "classConversation.html", "classConversation" ],
-    [ "dba_driver", "classdba__driver.html", "classdba__driver" ],
-    [ "dba_mysql", "classdba__mysql.html", "classdba__mysql" ],
-    [ "dba_mysqli", "classdba__mysqli.html", "classdba__mysqli" ],
-    [ "dba_postgres", "classdba__postgres.html", "classdba__postgres" ],
-    [ "enotify", "classenotify.html", null ],
-    [ "FKOAuth1", "classFKOAuth1.html", "classFKOAuth1" ],
-    [ "FKOAuthDataStore", "classFKOAuthDataStore.html", "classFKOAuthDataStore" ],
-    [ "FriendicaSmarty", "classFriendicaSmarty.html", "classFriendicaSmarty" ],
-    [ "FriendicaSmartyEngine", "classFriendicaSmartyEngine.html", "classFriendicaSmartyEngine" ],
-    [ "Item", "classItem.html", "classItem" ],
-    [ "ITemplateEngine", "interfaceITemplateEngine.html", "interfaceITemplateEngine" ],
-    [ "photo_driver", "classphoto__driver.html", "classphoto__driver" ],
-    [ "photo_gd", "classphoto__gd.html", "classphoto__gd" ],
-    [ "photo_imagick", "classphoto__imagick.html", "classphoto__imagick" ],
-    [ "ProtoDriver", "classProtoDriver.html", "classProtoDriver" ],
-    [ "Template", "classTemplate.html", "classTemplate" ],
-    [ "ZotDriver", "classZotDriver.html", "classZotDriver" ]
-];
\ No newline at end of file