Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

mod/editlayout.php

@@ -130,7 +130,7 @@ function editlayout_content(&$a) {
 	// FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD
 	// instead of loading a sensible page.  So, send folk to the webpage list.
 
-	$rp = '/layouts/' . $which;
+	$rp = 'layouts/' . $which;
 
 	$o .= replace_macros($tpl,array(
 		'$return_path'         => $rp,