git commit --amend --reset-author
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/js/templates/queryView.ejs