Refactor criteria parse in Query
merge denormalization
Merge branch 'refactor-with-embed'

Conflicts:
	lib/document.js
	lib/query/index.js