defer evaluation of logical operators
fixed small typo in documentation
defer evaluation of subqueries
Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4

Conflicts:
	CHANGELOG