Merge branch 'master' into tres and add some work on the item_deleted flag refactor

Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php

mod/ping.php

@@ -223,7 +223,7 @@ function ping_init(&$a) {
 			foreach($z as $zz) {
 				$notifs[] = array(
 					'notify_link' => $a->get_baseurl() . '/notify/view/' . $zz['id'], 
-					'name' => '', // not required here because the name is in the message
+					'name' => $zz['name'],
 					'url' => $zz['url'],
 					'photo' => $zz['photo'],
 					'when' => relative_date($zz['date']),