moved marker definitions
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh