new snapshot version
new snapshot version
new snapshot version
new snapshot version
new snapshot version
version change to merge
Merge branch '3.2.1'

Conflicts:
	phresco-cpp-archetype/src/main/resources/archetype-resources/pom.xml
	pom.xml