karma tests changed
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/test/specs/views/graphManagementViewSpec.js