hi
Merge branch 'master' of github.com:NerdYouDontKnow/xcode-plugin into test

Conflicts:
	.gitignore
	README
	pom.xml
	src/main/java/au/com/rayh/AbstractXCodeBuilder.java
	src/main/java/au/com/rayh/AbstractXCodeDescriptor.java
	src/main/java/au/com/rayh/AppFileFilter.java
	src/main/java/au/com/rayh/DeveloperProfile.java
	src/main/java/au/com/rayh/DeveloperProfileLoader.java
	src/main/java/au/com/rayh/GlobalConfigurationImpl.java
	src/main/java/au/com/rayh/JenkinsXCodeBuildOutputParser.java
	src/main/java/au/com/rayh/Keychain.java
	src/main/java/au/com/rayh/OSXKeychainBuildWrapper.java
	src/main/java/au/com/rayh/XCodeAction.java
	src/main/java/au/com/rayh/XCodeBuildOutputParser.java
	src/main/java/au/com/rayh/XCodeBuilder.java
	src/main/java/au/com/rayh/XCodeTester.java
	src/main/java/au/com/rayh/report/TestCase.java
	src/main/java/au/com/rayh/report/TestFailure.java
	src/main/java/au/com/rayh/report/TestSuite.java
	src/main/resources/au/com/rayh/DeveloperProfile/config.groovy
	src/main/resources/au/com/rayh/DeveloperProfile/help-description.html
	src/main/resources/au/com/rayh/DeveloperProfile/help-password.html
	src/main/resources/au/com/rayh/DeveloperProfile/help.html
	src/main/resources/au/com/rayh/DeveloperProfile/upload.groovy
	src/main/resources/au/com/rayh/DeveloperProfileLoader/config.groovy
	src/main/resources/au/com/rayh/GlobalConfigurationImpl/config.jelly
	src/main/resources/au/com/rayh/Messages.properties
	src/main/resources/au/com/rayh/XCodeBuilder/config.jelly
	src/main/resources/au/com/rayh/XCodeBuilder/help-allowFailingBuildResults.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-buildIpa.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-cfBundleShortVersionStringValue.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-cfBundleVersionValue.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-cleanBeforeBuild.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-codeSigningIdentity.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-configuration.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-configurationBuildDir.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-embeddedProfileFile.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-generateArchive.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-globalKeychainName.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-keychainName.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-keychainPath.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-keychainPwd.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-sdk.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-symRoot.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-target.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-unlockKeychain.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-xcodeProjectFile.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-xcodeProjectPath.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-xcodeSchema.html
	src/main/resources/au/com/rayh/XCodeBuilder/help-xcodeWorkspaceFile.html
	src/main/resources/au/com/rayh/XCodeTester/config.jelly
	src/main/resources/au/com/rayh/XCodeTester/help-allowFailingBuildResults.html
	src/main/resources/au/com/rayh/XCodeTester/help-cfBundleShortVersionStringValue.html
	src/main/resources/au/com/rayh/XCodeTester/help-cfBundleVersionValue.html
	src/main/resources/au/com/rayh/XCodeTester/help-cleanBeforeBuild.html
	src/main/resources/au/com/rayh/XCodeTester/help-configuration.html
	src/main/resources/au/com/rayh/XCodeTester/help-configurationBuildDir.html
	src/main/resources/au/com/rayh/XCodeTester/help-sdk.html
	src/main/resources/au/com/rayh/XCodeTester/help-symRoot.html
	src/main/resources/au/com/rayh/XCodeTester/help-target.html
	src/main/resources/au/com/rayh/XCodeTester/help-xcodeProjectFile.html
	src/main/resources/au/com/rayh/XCodeTester/help-xcodeProjectPath.html
	src/main/resources/au/com/rayh/XCodeTester/help-xcodeSchema.html
	src/main/resources/au/com/rayh/XCodeTester/help-xcodeWorkspaceFile.html
	src/main/resources/index.jelly
	src/main/webapp/help-cleanTestReports.html
	src/main/webapp/help-xcodebuildArguments.html
	src/test/java/Pkcs12.java
	src/test/java/Pkcs7.java
	src/test/java/au/com/rayh/JenkinsXCodeBuildOutputParserTest.java
	src/test/java/au/com/rayh/OutputParserTests.java
	src/test/java/au/com/rayh/XCodeBuildOutputParserTest.java
	src/test/java/au/com/rayh/XCodeBuilderTest.java
Merge pull request #1 from NerdYouDontKnow/test

Test