Merge conditions with $and

So that prior conditions are not ignored, merge any conditions for the
same property with $and.
confusing
Merge branch 'master' of https://github.com/09setht/mquery

Conflicts:
	.idea/workspace.xml

a mi no me gusta