Revert "Updated baseQuery() grammar in Parser"

This reverts commit 3bcb08454d80cec0d2a04836f9ed542f2db6003f.
added FIXME to buggy Parser.baseQuery()
BasicSolver now contains code to form groups of properties from
constraints

The idea is to form groups of constraints that have inter-dependencies.
Once we have these groups, we can avoid full backtracking which is
very expensive, and instead re-materialize only the relevant properties.
Added sample definition for constraint groups
ConstraintSolver now saves the complex property maps
Working on restricted backtracking
Revert "BasicSolver now uses QueryResolutionEngine's query evaluation instead"

This reverts commit 68517cae6c9caae2a18166bab0e57b9fd18dc304.

Conflicts:
	src/internal/parser/resolve/constraint/BasicSolver.java
Added methods resolveRelatedProperties and
resolveConstraintDependencies to ConstraintSolver
We now have limited backtracking
    Previously, when the BasicSolver failed to satisfy any of the
    specified constraints, it would reinitialize *everything*.
    This commit introduces a working partial-backtracking solution.
    It works by resolving the definition space into sets of related
    properties and then reinitializing only the set of properties
    that the BasicSolver failed to satisfy.

Updated BasicSolver to take relatedPropertiesMap as part of constructor