Updated guava version
Merge branch 'master' of https://github.com/Rincaro/dfs-datastores

Conflicts:
	pom.xml