Release of 1.2.1 version.
1.2.2-SNAPSHOT version
Merge branch 'develop' into contrib

Conflicts:
	pom.xml