Added a more precise information returned from gharial for collections
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
attempt to shield test from other influences
Deprecated _directedRelation and _undirectedRelation in general-graphs. Created _relation in general-graphs creating a _directedRelation. Handling undirected relations is now given to the user / api-implementor as arangodb itself does not offer any direction constrains which caused some confusion
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Fix DBserver bug with CollectionNameResolver and local collections.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	arangod/Utils/CollectionNameResolver.h
added derived file
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into mmh