Merge branch 'master' into dev

Conflicts:
	src/mainwindow.cpp

README.md

@@ -94,6 +94,12 @@ SilentDragonLite does automatic note and utxo management, which means it doesn't
 * Will automatically shield your transparent funds at the first opportunity
 * When sending an outgoing transaction to a shielded address, SilentDragonLite can decide to use the transaction to additionally shield your transparent funds (i.e., send your transparent funds to your own shielded address in the same transaction)
 
+## Where is my wallet stored?
+
+Linux: `~/.silentdragonlite`
+
+Windows 10: `C:\Users\%user\AppData\Roaming\silentdragonlite`
+
 ## Support
 
 For support join us on [Telegram Support](https://hush.is/telegram_support), or our [Main Telegram](https://hush.is/telegram) or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or [file an issue](https://git.hush.is/hush/SilentDragonLite/issues).

src/mainwindow.cpp

@@ -842,6 +842,8 @@ void MainWindow::setupSettingsModal() {
         settings.cmbServer->addItem("https://devo.crabdance.com");
         settings.cmbServer->addItem("https://lite.nyami.org");
         settings.cmbServer->addItem("https://poop.granitefone.me:9067");
+        settings.cmbServer->addItem("https://lite.hushpool.is");
+
         //settings.cmbServer->addItem("https://hush.leto.net:5420");
         //TODO: seperate lists of https/Tor servers, only show user or attempt
         // connection to .onion if user has it enabled