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/layouts.php

@@ -99,7 +99,7 @@ function layouts_content(&$a) {
 			dbesc(argv(3))
 		);
 		if($r) {
-			header('Content-type: application/x-redmatrix-layout');
+			header('Content-type: application/x-hubzilla-layout');
 			header('Content-disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"');
 			echo json_encode($r);
 			killme();