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

diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js
deleted file mode 100644
index 156bff173..000000000
--- a/doc/html/search/all_77.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var searchData=
-[
-  ['wall_5fattach_2ephp',['wall_attach.php',['../wall__attach_8php.html',1,'']]],
-  ['wall_5fattach_5fpost',['wall_attach_post',['../wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653',1,'wall_attach.php']]],
-  ['wall_5fupload_2ephp',['wall_upload.php',['../wall__upload_8php.html',1,'']]],
-  ['wall_5fupload_5fpost',['wall_upload_post',['../wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f',1,'wall_upload.php']]],
-  ['webfinger_2ephp',['webfinger.php',['../webfinger_8php.html',1,'']]],
-  ['webfinger_5fcontent',['webfinger_content',['../webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3',1,'webfinger.php']]],
-  ['webfinger_5frfc7033',['webfinger_rfc7033',['../include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a',1,'network.php']]],
-  ['webpages_2ephp',['webpages.php',['../webpages_8php.html',1,'']]],
-  ['webpages_5fcontent',['webpages_content',['../webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d',1,'webpages.php']]],
-  ['webpages_5finit',['webpages_init',['../webpages_8php.html#af9ad0b65eba79acead3fa32b43d888b7',1,'webpages.php']]],
-  ['wfinger_2ephp',['wfinger.php',['../wfinger_8php.html',1,'']]],
-  ['wfinger_5finit',['wfinger_init',['../wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3',1,'wfinger.php']]],
-  ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]],
-  ['while',['while',['../docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d',1,'docblox_errorchecker.php']]],
-  ['widedarkness_2ephp',['widedarkness.php',['../widedarkness_8php.html',1,'']]],
-  ['widget_5faffinity',['widget_affinity',['../widgets_8php.html#add9b24d3304e529a7975e96122315554',1,'widgets.php']]],
-  ['widget_5fappselect',['widget_appselect',['../widgets_8php.html#aced5cb177f630b30799c5eab873ee75c',1,'widgets.php']]],
-  ['widget_5farchive',['widget_archive',['../widgets_8php.html#a7b1e357b5a2027718470b77ec921fc65',1,'widgets.php']]],
-  ['widget_5fbookmarkedchats',['widget_bookmarkedchats',['../widgets_8php.html#a0e2f5179ed1a73b282dfda7270fcabb3',1,'widgets.php']]],
-  ['widget_5fcatcloud_5fwall',['widget_catcloud_wall',['../widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5',1,'widgets.php']]],
-  ['widget_5fcategories',['widget_categories',['../widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b',1,'widgets.php']]],
-  ['widget_5fchatroom_5flist',['widget_chatroom_list',['../widgets_8php.html#a47c72aac42058ea086c9ef8651c259da',1,'widgets.php']]],
-  ['widget_5fclock',['widget_clock',['../widgets_8php.html#a9d60539db68042e63c0015abd69a6f7a',1,'widgets.php']]],
-  ['widget_5fcollections',['widget_collections',['../widgets_8php.html#aa189a07241246d97efbee29f1c6a6f7f',1,'widgets.php']]],
-  ['widget_5fdesign_5ftools',['widget_design_tools',['../widgets_8php.html#a145ff35319cfa47a9cc07f9425bd674b',1,'widgets.php']]],
-  ['widget_5fdirsafemode',['widget_dirsafemode',['../widgets_8php.html#a268b01ce1ab8fe2cb346cb769b9d1091',1,'widgets.php']]],
-  ['widget_5fdirsort',['widget_dirsort',['../widgets_8php.html#a95c06bc9be133e89768746302d2ac395',1,'widgets.php']]],
-  ['widget_5fdirtags',['widget_dirtags',['../widgets_8php.html#a08035db02ff6a23260146b4c64153422',1,'widgets.php']]],
-  ['widget_5ffiler',['widget_filer',['../widgets_8php.html#a5ab3b64496e02cab56429978ad55f1c0',1,'widgets.php']]],
-  ['widget_5ffindpeople',['widget_findpeople',['../widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2',1,'widgets.php']]],
-  ['widget_5ffollow',['widget_follow',['../widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd',1,'widgets.php']]],
-  ['widget_5ffullprofile',['widget_fullprofile',['../widgets_8php.html#a70442dfa079312d9d5e5ee01be51a165',1,'widgets.php']]],
-  ['widget_5fitem',['widget_item',['../widgets_8php.html#a313a8d10ab81c71357c12e67e4d7efd5',1,'widgets.php']]],
-  ['widget_5fmailmenu',['widget_mailmenu',['../widgets_8php.html#afa2e55a78f95667a6da082efac7fec74',1,'widgets.php']]],
-  ['widget_5fmenu_5fpreview',['widget_menu_preview',['../widgets_8php.html#a3bdfb81bf9a8ddf219924fa7eaf22013',1,'widgets.php']]],
-  ['widget_5fnotes',['widget_notes',['../widgets_8php.html#a45ea061dabe9a8372e4ca3b9e5714256',1,'widgets.php']]],
-  ['widget_5fphoto',['widget_photo',['../widgets_8php.html#a999ba893cac7600d3d3b4e7e14cf8c20',1,'widgets.php']]],
-  ['widget_5fphoto_5falbums',['widget_photo_albums',['../widgets_8php.html#a702e2fc0adc9b615999eca18b7311b5e',1,'widgets.php']]],
-  ['widget_5fphoto_5frand',['widget_photo_rand',['../widgets_8php.html#af8eb466ef91d9e96e13335ead5eba380',1,'widgets.php']]],
-  ['widget_5fprofile',['widget_profile',['../widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'widgets.php']]],
-  ['widget_5frandom_5fblock',['widget_random_block',['../widgets_8php.html#a829c5a5c7448129266fc1df3ae1a3c2e',1,'widgets.php']]],
-  ['widget_5frating',['widget_rating',['../widgets_8php.html#a7d0724165067077ff46484e4610e4323',1,'widgets.php']]],
-  ['widget_5fsavedsearch',['widget_savedsearch',['../widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8',1,'widgets.php']]],
-  ['widget_5fsettings_5fmenu',['widget_settings_menu',['../widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01',1,'widgets.php']]],
-  ['widget_5fsuggestedchats',['widget_suggestedchats',['../widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8',1,'widgets.php']]],
-  ['widget_5fsuggestions',['widget_suggestions',['../widgets_8php.html#a0d404276fedc59f5038cf5c085028326',1,'widgets.php']]],
-  ['widget_5ftagcloud',['widget_tagcloud',['../widgets_8php.html#a6dbc227aac750774284ee39c45f0a200',1,'widgets.php']]],
-  ['widget_5ftagcloud_5fwall',['widget_tagcloud_wall',['../widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653',1,'widgets.php']]],
-  ['widget_5fvcard',['widget_vcard',['../widgets_8php.html#abe03366fd22fd27d683518fa0765da50',1,'widgets.php']]],
-  ['widgets_2ephp',['widgets.php',['../widgets_8php.html',1,'']]],
-  ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]],
-  ['wtagblock',['wtagblock',['../taxonomy_8php.html#a83f0a60f9e0c07d8451dc5be95b17287',1,'taxonomy.php']]]
-];