fix query
Merge branch 'master' of https://github.com/AM237/Bundestagswahl.git

Conflicts:
	TestBW/src/testbw/client/TestBW.java
query fixes
Merge branch 'master' of https://github.com/AM237/Bundestagswahl.git

Conflicts:
	TestBW/src/testbw/analysis/DataAnalyzer.java
	TestBW/src/testbw/client/TestBW.java
	TestBW/src/testbw/setup/BWSetupDatabase.java
fix