removed a remaining getOne()
fixed missing collections
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	arangod/Aql/ExecutionBlock.h
fixed assertion errors
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2