Merge branch 'master' into jquery

Conflicts:
	doc/ChangeLog

diff --cc data/templates/bookmarks.tpl.php
index 34beb393cb14a50e8923a304efae9ed6e1284d2a,c404358b39017e271727d471d9bf6bbd8ec54c81..55d6a0f6e862e4914a71c284f3b697dc34148db8
--- 1/data/templates/bookmarks.tpl.php
--- 2/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@@ -312,10 -309,11 +312,11 @@@ if ($currenttag!= '') 
                        $copy .= T_('you');
                } else {
                        $copy .= '<a href="' . createURL('bookmarks', $row['username']) . '">'
-                 . $row['username'] . '</a>';
+                 . SemanticScuttle_Model_UserArray::getName($row)
+                 . '</a>';
                }
  
 -              // Udders!
 +              // others
                if (!isset($hash)) {
                        $others = $otherCounts[$row['bAddress']];
                        $ostart = '<a href="' . createURL('history', $row['bHash']) . '">';

diff --cc data/templates/editprofile.tpl.php
Simple merge

diff --cc data/templates/sidebar.block.users.php
Simple merge

diff --cc src/SemanticScuttle/header.php
Simple merge

diff --cc tests/TestBase.php
Simple merge