added fix for absolute path
fixed test
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
more tests fixed
karma configuration fixed
fixed test setup
changed 'blubber' to 'Tools'
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Highlighting for dropdown item fixed
use new readline per default for mac
Merge remote-tracking branch 'origin/devel' into sharding

Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js