modifiable AQL, final syntax
slightly adjusted grammar
Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh

Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js