Merge 1.7.1-appbuilder into vladimirov/merge-appbuilder-1.7.1

# Conflicts:
#	lib/common

Author: rosen-vladimirov

lib/config.ts

@@ -22,6 +22,8 @@ export class Configuration extends ConfigBase implements IConfiguration { // Use
 $injector.register("config", Configuration);
 
 export class StaticConfig extends StaticConfigBase implements IStaticConfig {
+	public disableAnalytics = true;
+
 	public PROJECT_FILE_NAME = "package.json";
 	public CLIENT_NAME_KEY_IN_PROJECT_FILE = "nativescript";
 	public CLIENT_NAME = "tns";

lib/services/ios-project-service.ts

@@ -419,7 +419,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	public ensureConfigurationFileInAppResources(): IFuture<void> {
 		return (() => {
 			let projectDir = this.$projectData.projectDir;
-			let infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
+			let infoPlistPath = this.$options.baseConfig || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
 
 			if (!this.$fs.exists(infoPlistPath).wait()) {
 				// The project is missing Info.plist, try to populate it from the project template.
@@ -444,7 +444,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	private mergeInfoPlists(): IFuture<void> {
 		return (() => {
 			let projectDir = this.$projectData.projectDir;
-			let infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
+			let infoPlistPath = this.$options.baseConfig || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
 			this.ensureConfigurationFileInAppResources().wait();
 
 			if (!this.$fs.exists(infoPlistPath).wait()) {

lib/services/platform-service.ts

@@ -301,11 +301,11 @@ export class PlatformService implements IPlatformService {
 			let excludedDirs = [constants.APP_RESOURCES_FOLDER_NAME];
 			this.$projectFilesManager.processPlatformSpecificFiles(directoryPath, platform, excludedDirs).wait();
 
+			this.applyBaseConfigOption(platformData).wait();
+
 			// Process configurations files from App_Resources
 			platformData.platformProjectService.processConfigurationFilesFromAppResources().wait();
 
-			this.applyBaseConfigOption(platformData).wait();
-
 			// Replace placeholders in configuration files
 			platformData.platformProjectService.interpolateConfigurationFile().wait();