jfßsjfßsjf
Merge branch 'master' of github.com:ANGEL0/mitarbeitertool

Conflicts:
	client/lib/router/config.js