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

Conflicts:
	include/identity.php
	install/update.php
	util/messages.po
	view/nl/messages.po

include/identity.php

@@ -565,6 +565,7 @@ function identity_basic_export($channel_id, $items = false) {
 	if(! $items)
 		return $ret;
 
+
 	$r = q("select * from likes where channel_id = %d",
 		intval($channel_id)
 	);