added log of exception
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Don't use applicationContext.collection for system apps.
Allow passing joi params directly.
Allow ctrl.before to prevent further processing of the request.
Revert "Allow specifying "_" as collection prefix."

This reverts commit ebc5c1490d14471b04b8398b44a06896a9460ea8.
added resolving from example strings to objects in GRAPH_NEIGHBORS
Merge pull request #1023 from triAGENS/foxx-before-guard

Allow ctrl.before to prevent further processing of the request
Added tests and docs for param shorthand syntax, allow passing 'allowMultiple' via joi.meta, fixed joi.required/optional being ignored.
Added documentation for ctrl.before interrupts.
Provided examples for ctrl.allRoutes.
Merge pull request #1021 from triAGENS/easy-params

Allow passing joi params directly
Made Foxx.Repository methods behave more consistently. Fixes #975.
Adjusted tests to reflect corrected behaviour.
Merge pull request #1024 from triAGENS/repo-methods

Made Foxx.Repository methods behave more consistently (fixes #975)
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	arangod/V8Server/v8-vocbase.cpp