some docu
Merge branch 'master' of https://github.com/arangodb/arangodb-java-driver

Conflicts:
	src/main/java/com/arangodb/ArangoDriver.java