cleanup
async job management
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	arangod/RestServer/ArangoServer.cpp
	lib/Admin/ApplicationAdminServer.cpp
	lib/GeneralServer/GeneralServerDispatcher.h