don't use the obsolute property file in VersionServiceImpl
use the match colors to hightlight the corresponding nodes in the editor
the FindSqlGenerator uses an inner solution and thus does not need to inherit from the union based sql generator
forgot to add the "parent" value
more different colors and cleaning up the color code
Merged 'develop'.

Conflicts:
	annis-gui/src/main/webapp/VAADIN/themes/annis/styles.css
removed unused member
updated autogenerated css