Changed hardcoded error num in web interface to generated error object
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/apps/system/aardvark/frontend/js/views/applicationsView.js