bugfix wildcard search with more than six tokens
bugfix querybuilder with positioned words
workaround for select all kwic
bufix corpus loader sql
old workaround for vaadin table mulitple selection bug removed
vaadin 7 migration cont.
Merge branch 'master' into vaadin7

Conflicts:
	src/de/catma/ui/analyzer/MarkupResultPanel.java
	src/de/catma/ui/analyzer/PhraseResultPanel.java