attempt to fix fonts on linux
attempt to resolve conflict
Merge branch 'master' of https://github.com/Switajski/FlexibleOrders.git into itemstate

Conflicts:
	src/main/java/de/switajski/priebes/flexibleorders/report/itextpdf/PriebesIText5PdfView.java
	src/main/resources/META-INF/spring/database.properties
Merge branch 'itemstate' of https://github.com/Switajski/FlexibleOrders into itemstate