relaxed % and escaping
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/common/bootstrap/module-console.js