various
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/saxsys/saxnet/SaxnetApplication.java
	src/main/java/de/saxsys/saxnet/SaxnetController.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/saxsys/saxnet/SaxnetController.java
various