Fix broken rebase

Author: Fatme

lib/node-package-manager.ts

@@ -45,7 +45,7 @@ export class NodePackageManager implements INodePackageManager {
 					packageToInstall = packageName + "@" + version;
 				}
 
-				this.installCore(pathToSave, packageToInstall).wait();
+				this.installCore(packageToInstall, pathToSave).wait();
 			} catch(error) {
 				this.$logger.debug(error);
 				this.$errors.fail(NodePackageManager.NPM_LOAD_FAILED);

lib/services/platform-service.ts

@@ -104,8 +104,8 @@ export class PlatformService implements IPlatformService {
 			// One level up is the runtime module and one above is the node_modules folder.
 			this.$fs.deleteDirectory(path.join("../", frameworkDir)).wait();
 
-			platformData.platformProjectService.interpolateData(platformData.projectRoot);
-			platformData.platformProjectService.afterCreateProject(platformData.projectRoot);
+			platformData.platformProjectService.interpolateData(platformData.projectRoot).wait();
+			platformData.platformProjectService.afterCreateProject(platformData.projectRoot).wait();
 		}).future<void>()();
 	}