Merge remote-tracking branch 'bokobza/master' into start-tumbling-work

.gitignore

@@ -298,3 +298,4 @@ project.lock.json
 /Breeze/src/Breeze.Daemon/Wallets
 /Breeze/src/Breeze.Daemon/Logs
 /Breeze.UI/.vscode/.BROWSE.VC.DB-wal
+/Breeze.UI/.vscode/.BROWSE.VC.DB-shm

Breeze.UI/src/app/setup/create/create.component.html

@@ -22,6 +22,7 @@
           <select name="network" formControlName="selectNetwork">
             <!--<option value="main">Main</option>-->
             <option value="test">Testnet</option>
+            <option value="stratistest">StratisTest</option>
           </select>
         </div>
         <div class="form-group">

Breeze/Breeze.sln

@@ -77,5 +77,6 @@ Global
 		{D16CD478-9D1E-4C69-91AD-43539E94A215} = {807563C4-7259-434D-B604-A14C3DCF8E30}
 		{2490DD1A-6C14-47F2-A9C6-56761A52E2D9} = {807563C4-7259-434D-B604-A14C3DCF8E30}
 		{29E411B1-5687-43EE-A71B-6CCEC2289129} = {1B724678-2B73-483E-B981-3A6733C2194E}
+		{AAF6163B-1BE2-48CE-9F9F-577C6D7AAB8D} = {807563C4-7259-434D-B604-A14C3DCF8E30}
 	EndGlobalSection
 EndGlobal

Breeze/src/Breeze.Daemon/Properties/launchSettings.json

@@ -7,6 +7,10 @@
     "Breeze.Daemon TestNet": {
       "commandName": "Project",
       "commandLineArgs": "-testnet -tumbler-uri=http://localhost:5050 light -debug"
+    },
+    "StratisTest": {
+      "commandName": "Project",
+      "commandLineArgs": "stratis -testnet"
     }
   }
 }
\ No newline at end of file