Fixed configuration files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	lunchlauncher-dm/src/main/java/de/laudert/lunchlauncher/service/EntityService.java
	lunchlauncher-webapp/pom.xml