removed AtMatrixSqlGenerator and AtAnnotationConditionProvider and integrated their functionality into their base class
adjusting tests to the "annotext" annotation condition provider