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

diff --git a/doc/html/search/files_66.js b/doc/html/search/files_66.js
deleted file mode 100644
index 6d83aa37c..000000000
--- a/doc/html/search/files_66.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var searchData=
-[
-  ['fbrowser_2ephp',['fbrowser.php',['../fbrowser_8php.html',1,'']]],
-  ['features_2ephp',['features.php',['../features_8php.html',1,'']]],
-  ['feed_2ephp',['feed.php',['../feed_8php.html',1,'']]],
-  ['filer_2ephp',['filer.php',['../filer_8php.html',1,'']]],
-  ['filerm_2ephp',['filerm.php',['../filerm_8php.html',1,'']]],
-  ['filestorage_2ephp',['filestorage.php',['../filestorage_8php.html',1,'']]],
-  ['fixd_2ephp',['fixd.php',['../fixd_8php.html',1,'']]],
-  ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]],
-  ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
-  ['fpostit_2ephp',['fpostit.php',['../fpostit_8php.html',1,'']]],
-  ['fresh_2emd',['fresh.md',['../fresh_8md.html',1,'']]],
-  ['friendica_2dto_2dsmarty_2dtpl_2epy',['friendica-to-smarty-tpl.py',['../friendica-to-smarty-tpl_8py.html',1,'']]],
-  ['fsuggest_2ephp',['fsuggest.php',['../fsuggest_8php.html',1,'']]],
-  ['full_2ephp',['full.php',['../full_8php.html',1,'']]],
-  ['functions_2ephp',['functions.php',['../functions_8php.html',1,'']]]
-];