update version to 2.1.1 snapshot
change version to 2.1.1
update to 2.1.2
update to 2.1.3
update versions
Merge branch '2.1.x'

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