update version to 2.1.5
Merge branch '2.1.x'

Conflicts:
	pom.xml