Merge pull request #79 from Merglasch/jonathan

DB-METHODEN
MagnusundAnge

war gar nicht bange
und so taten sie lange
Merge branch 'master' into magnusBranch

Conflicts:
	Sopra/src/model/account/UserService.java
	Sopra/src/model/modules/ModulhandbuchService.java
stichtag update
Merge branch 'master' into Inna

Conflicts:
	Sopra/WebContent/stichtagSetzen.xhtml