inject bind parameters
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	arangod/CMakeLists.txt
	arangod/Makefile.files