optimized dijsktra search
jslint
resolve merge conflict
jslinted code
manually merged docu into mdpp
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel