new snapshot version
Merge branch 'master' into 3.2.0

Conflicts:
	.phresco/phresco-performance-test-info.xml
	pom.xml
	test/functional/pom.xml
	test/performance/pom.xml
	test/unit/pom.xml