diverse Korrekturen + Kommentare
Merge branch 'master' into daniel

Conflicts:
	Sopra/src/model/account/UserBean.java