fixed cluster chart
 cleaned up merge mess
removed no longer needed logs
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
added missing files