Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

diff --cc data/templates/default/bookmarks.tpl.php
Simple merge

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

diff --cc data/templates/default/rss.tpl.php
Simple merge

diff --cc data/templates/testdummy/top.inc.php
Simple merge

diff --cc doc/UPGRADE.txt
index 53ccbf403f486738b3a4ac86d2e228e511c26d57,0e570e582b773ab02a9130e216ddd7a1a2df37d7..1a0b9644dd4bae35d93b20caf3a82c2dead37186
--- 1/doc/UPGRADE.txt
--- 2/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@@ -3,21 -4,14 +4,17 @@@ Upgrading SemanticScuttle from a previo
  
  
  From version 0.97 to 0.98
- -------------------------
- Database updates: Apply data/schema/6.sql or do the following:
- 
-     CREATE TABLE `sc_version` (
-       `schema_version` int(11) NOT NULL
-     ) DEFAULT CHARSET=utf8;
- 
-     INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
+ =========================
+ Database updates
+ ----------------
+ Apply ``data/schema/6.sql``
  
 +    ALTER TABLE `sc_users` ADD `privateKey` VARCHAR(33) NULL;
 +    CREATE UNIQUE INDEX `privateKey` ON `sc_users` (`privateKey`);
 +
  
  From version 0.96 to 0.97
- -------------------------
+ =========================
  No database changes necessary.
  
  

diff --cc www/jsScuttle.php
Simple merge