Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts:
	include/identity.php

include/identity.php

@@ -7,7 +7,6 @@ require_once('include/zot.php');
 require_once('include/crypto.php');
 require_once('include/menu.php');
 
-
 /**
  * @brief Called when creating a new channel.
  *
@@ -607,6 +606,16 @@ function identity_basic_export($channel_id, $items = false) {
 		}
 	}
 
+	$x = menu_list($channel_id);
+	if($x) {
+		$ret['menu'] = array();
+		for($y = 0; $y < count($x); $y ++) {
+			$m = menu_fetch($x[$y]['menu_name'],$channel_id,$ret['channel']['channel_hash']);
+			if($m)
+				$ret['menu'][] = menu_element($m);
+		}
+	}
+
 
 	if(! $items)
 		return $ret;

version.inc

@@ -1 +1 @@
-2015-09-07.1148
+2015-09-08.1149