some modifications for collection accessing
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding

Conflicts:
	arangod/Cluster/AgencyComm.cpp