Modulhandbuchsuche update
Merge pull request #57 from Merglasch/jonathan

Modulhandbuchsuche update
IDGenerator Persistence Update
Merge pull request #58 from Merglasch/jonathan

IDGenerator Persistence Update
ModulService

DB Methoden für Suchfunktion
Merge branch 'master' into Daniel-Services

Conflicts:
	Sopra/src/model/account/LoeschBean.java
IDGenerator
Merge branch 'master' into JonathanBranch

Conflicts:
	Sopra/src/model/IDGenerator.java
checkboxes

checkboxes mit auswahl logik fuer benuter - module- benachr. loeschen
Merge branch 'master' into magnusbranch

Conflicts:
	Sopra/WebContent/modulLoeschen.xhtml
	Sopra/src/model/account/LoeschBean.java
ID Generator
Merge pull request #62 from Merglasch/jonathan

ID Generator
IDGenerator Update
Merge pull request #63 from Merglasch/jonathan

IDGenerator Update
DB-METHODE

searchByModulhandbuch(Modulhandbuch)
Merge pull request #64 from Merglasch/jonathan

DB-METHODE
searchByModulhandbuch Update
Merge pull request #65 from Merglasch/jonathan

searchByModulhandbuch Update
Merge remote-tracking branch 'origin/master' into Innas_Aufgabe

Conflicts:
	Sopra/build/classes/META-INF/persistence.xml
	Sopra/src/META-INF/persistence.xml
	Sopra/src/model/account/LoeschBean.java
	Sopra/src/model/modules/ModuleService.java