new snapshot version
Merge branch 'master' into 3.2.0

Conflicts:
	android-maven-plugin/pom.xml
	android-phresco-plugin/pom.xml
	blackberry-phresco-plugin/pom.xml
	ci-phresco-plugin/pom.xml
	cq5-phresco-plugin/pom.xml
	dotnet-phresco-plugin/pom.xml
	drupal-phresco-plugin/pom.xml
	felix-phresco-plugin/pom.xml
	hybridAppLauncher-maven-plugin/pom.xml
	java-phresco-plugin/pom.xml
	javascript-maven-plugin/pom.xml
	jmeter-maven-plugin/pom.xml
	js-import-maven-plugin/pom.xml
	js-testrunner-plugin/pom.xml
	jslint-maven-plugin/pom.xml
	jstest-maven-plugin/pom.xml
	nodejs-phresco-plugin/pom.xml
	php-phresco-plugin/pom.xml
	phresco-maven-plugin/pom.xml
	phresco-maven-plugin/src/test/projects/PHR_PhpHelloworld/pom.xml
	phresco-maven-plugin/src/test/projects/PHR_YUIHelloworld/pom.xml
	phrescorelease-maven-plugin/pom.xml
	plugin-commons/pom.xml
	pom.xml
	report-phresco-plugin/pom.xml
	sharepoint-phresco-plugin/pom.xml
	sitecore-phresco-plugin/pom.xml
	windows-phone-phresco-plugin/pom.xml
	wordpress-phresco-plugin/pom.xml
	xcode-maven-plugin/pom.xml
	xcode-phresco-plugin/pom.xml
version changed
Merge branch '3.2.0'