Merge remote-tracking branch 'origin/release' into HEAD

Author: IceBuildUser

lib/services/test-execution-service.ts

@@ -193,15 +193,20 @@ class TestExecutionService implements ITestExecutionService {
 				options: {
 					debugTransport: this.$options.debugTransport,
 					debugBrk: this.$options.debugBrk,
+					watch: !!this.$options.watch
 				}
 			},
 		};
+
 		if (this.$config.DEBUG || this.$logger.getLevel() === 'TRACE') {
 			karmaConfig.logLevel = 'DEBUG';
 		}
+
 		if (!this.$options.watch) {
+			// Setting singleRun to true will automatically start the tests when new browser (device in our case) is registered in karma.
 			karmaConfig.singleRun = true;
 		}
+
 		if (this.$options.debugBrk) {
 			karmaConfig.browserNoActivityTimeout = 1000000000;
 		}

setup/native-script.ps1

@@ -1,6 +1,6 @@
 
 # A PowerShell script to set up Windows machine for NativeScript development
-# NOTE: The scripts requires at least a version 4.0 .NET framework installed
+# NOTE: The script requires at least a version 4.0 .NET framework installed
 # To run it inside a COMMAND PROMPT against the production branch (only one supported with self-elevation) use
 # @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/NativeScript/nativescript-cli/production/setup/native-script.ps1'))"
 # To run it inside a WINDOWS POWERSHELL console against the production branch (only one supported with self-elevation) use