Conflicts:
	fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCSVInformation.java
	fda-query-service/rest-service/src/main/java/at/tuwien/endpoint/QueryEndpoint.java
	fda-query-service/services/src/main/java/at/tuwien/service/QueryService.java
	fda-table-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
	fda-table-service/services/src/main/java/at/tuwien/service/PostgresService.java
	fda-table-service/services/src/main/java/at/tuwien/service/TableService.java
	fda-ui/Dockerfile


Former-commit-id: 6fd3e083