Renamed Server to Dispatcher
Fixed a race-condition but
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel