new snapshot version
Merge branch 'master' into 3.2.0

Conflicts:
	amazon/aws/pom.xml
	file-server/pom.xml
	phresco-tools/pom.xml
	pom.xml
version changed
Merge branch '3.2.0'