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

several dav fixes
Conflicts:
	include/items.php

include/items.php

@@ -3768,7 +3768,6 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				if(! post_is_importable($datarray,$contact))
 					continue;
 
-
 				logger('consume_feed: author ' . print_r($author,true),LOGGER_DEBUG);
 
 				logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);