fixed creation of subqueries from JSON input
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	arangod/Aql/ExecutionNode.h