Ensured QRES and ENVS are initialized for each query (+ExpressionSolver)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/pjwstk/tests/parser/ExpressionParserWithExternalSourceTest.java