Merge branch 'master' into develop

diff --combined src/cx/fbn/nevernote/NeverNote.java
index d25490c,7b79790..8f93206
--- 1/src/cx/fbn/nevernote/NeverNote.java
--- 2/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@@ -2964,7 -2964,6 +2964,7 @@@ public class NeverNote extends QMainWin
                status.setTagCount(listManager.getTagIndex().size());
                status.setResourceCount(conn.getNoteTable().noteResourceTable.getResourceCount());
                status.setWordCount(conn.getWordsTable().getWordCount());
 +              status.setHistoryCount(conn.getHistoryTable().getHistoryCount());
                waitCursor(false);
                status.exec();
        }
@@@ -7631,7 -7630,7 +7631,7 @@@
                                String tableGuid = (String) ix.values().toArray()[0];
                                if (tableGuid.equals(rensoNotePressedItemGuid)) {
                                        noteTableView.selectRow(i);
-                                       return;
+                                       break;
                                }
                        }
                }