removed debug output
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh
update()
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh

Conflicts:
	arangod/VocBase/edge-collection.h