laf
scheiße
Merge origin/master

Conflicts:
	pom.xml
	src/main/java/de/dachsbau/electron/ng/App.java