IDGenerator
Merge branch 'master' into JonathanBranch

Conflicts:
	Sopra/src/model/IDGenerator.java