new snapshot version
Merge branch 'master' into 3.2.0

Conflicts:
	.phresco/phresco-load-test-info.xml
	.phresco/phresco-performance-test-info.xml
	pom.xml
	test/load/server/pom.xml
	test/load/webservice/pom.xml
	test/performance/database/pom.xml
	test/performance/server/pom.xml
	test/performance/webservice/pom.xml