An Florians Version angepasst
uml
Merge remote-tracking branch 'origin/master'

Conflicts:
	bank/.PersistenceGeneratorConfiguration.xml
	bank/.TypeNumbers.xml
	bank/bank.goja