begin restructuring for more efficient annotation category queries:

- SqlGenerator is now not automatically a ResultSetExtractor
- the join with the annotation category will be in an outer FindSqlGenerator, the old one was renamed to SolutionSqlGenerator
restructuring and fixing the spring configuration for the SQL generators and also rename the innerSql variables to "solutionSqlGenerator"