CB-6522 Disallow space in target name

- Update target add command
- Update auto-detected target
diff --git a/blackberry10/bin/lib/target.js b/blackberry10/bin/lib/target.js
index 0f12643..0aac883 100644
--- a/blackberry10/bin/lib/target.js
+++ b/blackberry10/bin/lib/target.js
@@ -105,6 +105,7 @@
         if (properties.targets.hasOwnProperty(targetName)) {
             console.log("Overwriting target: " + targetName);
         }
+        targetName = targetName.replace(/ /g, "-");
         properties.targets[targetName] = {"ip": ip, "type": type, "password": password, "pin": pin};
     });
 
diff --git a/blackberry10/bin/templates/project/cordova/lib/run-utils.js b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
index 1dcfa92..78df1fc 100644
--- a/blackberry10/bin/templates/project/cordova/lib/run-utils.js
+++ b/blackberry10/bin/templates/project/cordova/lib/run-utils.js
@@ -282,7 +282,7 @@
 
         targetUtils.getDeviceInfo(ip, devicePass, function (err, device) {
             if (!err) {
-                targetName = device.name + "-" + device.pin;
+                targetName = device.name.replace(/ /g, "-") + "-" + device.pin;
                 props.targets[targetName] = {
                     ip: ip,
                     pin: device.pin,