stellvertreter hinzufuegen
Merge remote-tracking branch 'origin/master' into inna
stellvertreter hinzufügen komplett
Stichtag setzen
stichtag setzen update
Merge branch 'master' into inna

Conflicts:
	Sopra/WebContent/WEB-INF/.faces-config.xml.jsfdia
	Sopra/WebContent/WEB-INF/faces-config.xml
	Sopra/WebContent/modulAendern1.xhtml
	Sopra/src/model/account/UserBean.java