Dev2.1

Fixed Expand bug.

Removed Expand from import in LazyVariableElimination

Require clean before compile in build.xml