putting QueryData extensions to their own package (so they are easier to find)
Merge branch 'master' into frequencies
moved possible SQL generator result to annis.dao.objects package and added FrequencyTable result
first code to extract frequency result
FrequencyTableQueryData needs to be more complex than just a string
adding the FrequencySqlGenerator to Spring
Merge branch 'master' into frequencies
Merge branch 'master' into frequencies
making some functions static in order to remove some hacks
removed the hack with the TableJoinsInFromClauseSqlGenerator used to get the aliased name for "node"
adding frequency table template
Merge remote-tracking branch 'origin/master' into frequencies

Conflicts:
	annis-interfaces/src/main/java/annis/service/objects/SaltURIGroupSet.java
	annis-service/src/main/java/annis/AnnisRunner.java
	annis-service/src/main/java/annis/dao/SpringAnnisDao.java
	annis-service/src/main/java/annis/service/internal/QueryService.java
	annis-service/src/main/java/annis/sqlgen/GraphWithClauseGenerator.java
	annis-service/src/main/java/annis/sqlgen/SaltURIs.java
	annis-service/src/main/java/annis/sqlgen/extensions/SaltURIs.java
import fixes
Merge remote-tracking branch 'origin/master' into frequencies

Conflicts:
	annis-service/src/main/java/annis/dao/SpringAnnisDao.java
restoring getter/setter functions that did not survive the merge
another attempt for how frequency queries could look like
do not join with corpus table if FindSqlGenerator is used as inner query generator for count and matrix operations
some more (untested) implementations of functions in the FrequencySqlGenerator
service can now use the frequency query (for debugging since SQL generation does not work yet)
implementing where conditions