change version to 2.1.1
update to 2.1.2
update to 2.1.3
update dependency versions
update to 1.1.5 of datastore
Merge branch '2.1.x'

Conflicts:
	pom.xml