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, 1 insertions, 1 deletions

diff --git a/include/Import/refimport.php b/include/Import/refimport.php
index a7c0ef4c8..9b9b04bc7 100644
--- a/include/Import/refimport.php
+++ b/include/Import/refimport.php
@@ -177,7 +177,7 @@ function reflect_photo_callback($matches) {
 				'resource_id' => str_replace('-','',$hash),
 				'filename' => $hash . '.jpg',
 				'type' => 'image/jpeg',
-				'not_visible' => true
+				'visible' => false
 			)
 		);