removed comments
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel