fixed return
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
added show marker info
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel