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

diff --git a/doc/html/dir_8543001e5d25368a6edede3e63efb554.js b/doc/html/dir_8543001e5d25368a6edede3e63efb554.js
deleted file mode 100644
index 239cb24bf..000000000
--- a/doc/html/dir_8543001e5d25368a6edede3e63efb554.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var dir_8543001e5d25368a6edede3e63efb554 =
-[
-    [ "apw", "dir_d520c5cf583201d9437764f209363c22.html", "dir_d520c5cf583201d9437764f209363c22" ],
-    [ "hivenet", "dir_6e52a2a2cd27c08b7df5e5cdb216bd77.html", "dir_6e52a2a2cd27c08b7df5e5cdb216bd77" ],
-    [ "mytheme", "dir_8e58ba5e98ac07e59ee15ca7486c9950.html", "dir_8e58ba5e98ac07e59ee15ca7486c9950" ],
-    [ "redbasic", "dir_55dbaf9b7b53c4fc605c9011743a7353.html", "dir_55dbaf9b7b53c4fc605c9011743a7353" ],
-    [ "sporadic", "dir_b1008ce0b02657da707945523382e0f8.html", "dir_b1008ce0b02657da707945523382e0f8" ],
-    [ "stumble", "dir_4acb285a1960a920438b718da0958cf4.html", "dir_4acb285a1960a920438b718da0958cf4" ],
-    [ "suckerberg", "dir_0262a6a8df56a167e3761b6e5a54bb1c.html", "dir_0262a6a8df56a167e3761b6e5a54bb1c" ],
-    [ "sunbeam", "dir_84d42485a570ed49b44a03b64f62adcc.html", "dir_84d42485a570ed49b44a03b64f62adcc" ],
-    [ "yolo", "dir_73186942b3defcab180a242f911ab570.html", "dir_73186942b3defcab180a242f911ab570" ]
-];
\ No newline at end of file