Merge branch 'master' of https://github.com/redmatrix/redmatrix

several dav fixes
Conflicts:
	include/items.php

include/conversation.php

@@ -588,7 +588,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 				if($arr_blocked) {
 					$blocked = false;
 					foreach($arr_blocked as $b) {
-						if(($b) && ($item['author_xchan'] == $b)) {
+						if(($b) && (($item['author_xchan'] == $b) || ($item['owner_xchan'] == $b))) { 
 							$blocked = true;
 							break;
 						}