Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into pregel
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into pregel
Merge branch 'pregel' of https://github.com/triAGENS/ArangoDB into pregel
Merge branch 'pregel' of https://github.com/triAGENS/ArangoDB into pregel
Merge branch 'pregel' of https://github.com/triAGENS/ArangoDB into pregel
conductor, changed behaviour of conductorAlgorithm