fixed return code in documentation api-graph.js DELETE from 204 to 200/202
conflict resolution
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel