Merge branch '3.0' of github.com:zotero/zotero into 3.0

chrome/content/zotero/overlay.xul

@@ -77,7 +77,7 @@
 		<image src="chrome://zotero/skin/treeitem-book.png" id="zotero-status-image"
 			onclick="if(event.button === 0) Zotero_Browser.scrapeThisPage()" context="zotero-status-image-context"
 			position="1" hidden="true"/>
-		<zoteroguidancepanel id="zotero-status-image-guidance" about="saveIcon" for="zotero-status-image"/>
+		<zoteroguidancepanel id="zotero-status-image-guidance" about="saveIcon" for="zotero-status-image" x="8"/>
 	</hbox>
 		
 	<menupopup id="menu_ToolsPopup">

chrome/content/zotero/xpcom/data/tag.js

@@ -353,8 +353,16 @@ Zotero.Tag.prototype.save = function (full) {
 			
 			var sql = "UPDATE tags SET " + columns.join("=?, ") + "=?"
 				+ " WHERE tagID=?";
+			try {
 				Zotero.DB.query(sql, sqlValues);
 			}
+			// TEMP
+			catch (e) {
+				var sql = "SELECT * FROM tags";
+				Zotero.debug(Zotero.DB.query(sql));
+				throw (e);
+			}
+		}
 		
 		
 		// Linked items

chrome/content/zotero/zoteroPane.js

@@ -3169,10 +3169,10 @@ var ZoteroPane = new function()
 		
 		if (item.libraryID) {
 			var group = Zotero.Groups.getByLibraryID(item.libraryID);
-			filesEditable = group.filesEditable;
+			var filesEditable = group.filesEditable;
 		}
 		else {
-			filesEditable = true;
+			var filesEditable = true;
 		}
 		
 		if (saveSnapshot) {