SERVER-6400 new expression tree and parser
Will eventually replace Matcher

Conflicts:

	src/mongo/SConscript
SERVER-6400 compile in non-debug mode
SERVER-6400 - fix case with indexes early field
SERVER-6400 - fix regex parsing error message and add some tests for field ordering
SERVER-6400 - move MatchDetails out of matcher.h

Conflicts:

	src/mongo/SConscript
	src/mongo/db/matcher.cpp
	src/mongo/db/matcher.h
SERVER-6400 - fix compile with optimizer onf
SERVER-6400 - framework and start of Matcher replacement.  using Matcher2 name

Conflicts:

	src/mongo/SConscript
SERVER-6400 - some style improvements for Matcher2
SERVER-6400 rename *Expression* to *MatchExpression* to avoid conflict
SERVER-6400 - keep a real BSONObj in Matcher2, not a reference
SERVER-6400: MatchExpression version of Matcher code complete.

Conflicts:

	src/mongo/dbtests/matchertests.cpp
SERVER-6400: do not use IN since its a macro on windows
SERVER-6400 new version of hasExistsFalse
SERVER-6400: prep to have both MatcherOld and Matcher2 in the code base

Conflicts:

	src/mongo/db/matcher.cpp
	src/mongo/db/matcher.h
	src/mongo/db/matcher_old.cpp
	src/mongo/db/matcher_old.h
	src/mongo/dbtests/matchertests.cpp
SERVER-6400: remove MatchCategory concept
SERVER-6400: optimizations around parsing paths

Conflicts:

	src/mongo/db/matcher/expression_array.cpp
	src/mongo/db/matcher/expression_leaf.cpp
SERVER-6400: more caching of FieldRefs

Conflicts:

	src/mongo/db/matcher/expression_array.cpp
SERVER-6400: cleaning api for performance

Conflicts:

	src/mongo/db/matcher/expression_array.cpp
	src/mongo/db/matcher/expression_leaf.cpp
	src/mongo/db/matcher/matchable.cpp
	src/mongo/db/matcher/matchable.h
	src/mongo/db/matcher/matcher.cpp
SERVER-6400: small chnages for jstests/(and|or)*.js
SERVER-6400 Use an abstraction layer into MatchExpression for different formats
   currently BSONObj vs index keys

Conflicts:

	src/mongo/db/matcher/expression_array.cpp
	src/mongo/db/matcher/expression_leaf.cpp
	src/mongo/db/matcher/matchable.cpp
	src/mongo/db/matcher/matchable.h
	src/mongo/db/matcher/matcher.cpp