javadoc comments
Merge branch 'master' into jonathan

Conflicts:
	Sopra/src/model/ModelBean.java
	Sopra/src/model/TreeService.java
	Sopra/src/model/account/StellvertreterService.java
	Sopra/src/model/account/UserBean.java
	Sopra/src/model/account/UserService.java
	Sopra/src/model/modules/CreateModulhandbuch.java
Merge branch 'master' of https://github.com/Merglasch/4142Sopra