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

diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js
deleted file mode 100644
index 92b4f2c38..000000000
--- a/doc/html/identity_8php.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var identity_8php =
-[
-    [ "advanced_profile", "identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4", null ],
-    [ "channel_total", "identity_8php.html#a77d2237f1846964634b1c99089c27c7d", null ],
-    [ "create_identity", "identity_8php.html#a345f4c943d84de502ec6e72d2c813945", null ],
-    [ "create_sys_channel", "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05", null ],
-    [ "get_birthdays", "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ],
-    [ "get_channel_by_nick", "identity_8php.html#ac73b3e13778c564c877554517a7f51ba", null ],
-    [ "get_channel_default_perms", "identity_8php.html#a293f416ce9050220b183e08ff5890216", null ],
-    [ "get_default_profile_photo", "identity_8php.html#ab1485a26b032956e1496fc08c58b83ed", null ],
-    [ "get_events", "identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ],
-    [ "get_my_address", "identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ],
-    [ "get_my_url", "identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec", null ],
-    [ "get_online_status", "identity_8php.html#a332df795f684788002f5a6424abacfd7", null ],
-    [ "get_profile_fields_advanced", "identity_8php.html#a224710dfb7465b706c91134247c20afa", null ],
-    [ "get_profile_fields_basic", "identity_8php.html#a4ff59df0f0a668a06a8411f87496aa21", null ],
-    [ "get_sys_channel", "identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51", null ],
-    [ "get_theme_uid", "identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3", null ],
-    [ "identity_basic_export", "identity_8php.html#afaedbc8e2d2a70ec8b006162baac5249", null ],
-    [ "identity_check_service_class", "identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633", null ],
-    [ "identity_selector", "identity_8php.html#a2ab5172eabd375869060c9ad68323f5c", null ],
-    [ "is_foreigner", "identity_8php.html#ae2b140df652a55ca11bb6a99005fce35", null ],
-    [ "is_member", "identity_8php.html#a9637c557e13d9671f3eeb124ab98212a", null ],
-    [ "is_public_profile", "identity_8php.html#a4e996e44b50330098a04b467367a559f", null ],
-    [ "is_sys_channel", "identity_8php.html#aa4bd4abfcba883f43919e89ec6419025", null ],
-    [ "notifications_off", "identity_8php.html#a2e6a1cc35887937823ec7fbb90472afe", null ],
-    [ "notifications_on", "identity_8php.html#a5650319c799de09d1b6d1076b6f839a4", null ],
-    [ "profile_create_sidebar", "identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620", null ],
-    [ "profile_load", "identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ],
-    [ "profile_sidebar", "identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc", null ],
-    [ "remote_online_status", "identity_8php.html#a47d6f53216f23a3484061793bef29854", null ],
-    [ "set_default_login_identity", "identity_8php.html#a78151baf4407a8482d2681a91a9c486b", null ],
-    [ "validate_channelname", "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58", null ],
-    [ "zid", "identity_8php.html#a5b815330f3d177ab383af37a6c12e532", null ],
-    [ "zid_init", "identity_8php.html#a680fbafc2db023c5b1309e0180e81315", null ]
-];
\ No newline at end of file