Merge remote-tracking branch 'origin/automated-testing' into automated-testing

# Conflicts:
#	test/test.ts

test/test.ts

@@ -193,6 +193,11 @@ class RNIOS extends Platform.IOS implements RNPlatform {
             // Fix the linker flag list in project.pbxproj (pod install adds an extra comma)
             .then(TestUtil.replaceString.bind(undefined, path.join(iOSProject, TestConfig.TestAppName + ".xcodeproj", "project.pbxproj"), 
                 "\"[$][(]inherited[)]\",\\s*[)];", "\"$(inherited)\"\n\t\t\t\t);"))
+            // Prevent the packager from starting during builds by replacing the script that starts it with nothing.
+            .then(TestUtil.replaceString.bind(undefined, 
+                path.join(projectDirectory, TestConfig.TestAppName, "node_modules", "react-native", "React", "React.xcodeproj", "project.pbxproj"),
+                "shellScript = \".*\";",
+                "shellScript = \"\";"))
             // Copy the AppDelegate.m to the project
             .then(TestUtil.copyFile.bind(undefined,
                 path.join(TestConfig.templatePath, "ios", TestConfig.TestAppName, "AppDelegate.m"),
@@ -297,10 +302,10 @@ class RNProjectManager extends ProjectManager {
         return copyDirectoryRecursively(templatePath, path.join(projectDirectory, TestConfig.TestAppName));
     }
 
-	/**
-	 * Creates a new test application at the specified path, and configures it
-	 * with the given server URL, android and ios deployment keys.
-	 */
+    /**
+     * Creates a new test application at the specified path, and configures it
+     * with the given server URL, android and ios deployment keys.
+     */
     public setupProject(projectDirectory: string, templatePath: string, appName: string, appNamespace: string, version?: string): Q.Promise<void> {
         if (fs.existsSync(projectDirectory)) {
             del.sync([projectDirectory], { force: true });