uml updated
Merge remote-tracking branch 'origin/work' into work
filled more cols and other stuff
reformatting
overwrite toString
Merged branch work

* work:
  overwrite toString
  reformatting
  filled more cols and other stuff
  uml updated

Conflicts:
	src/ch/jmanagr/bo/Department.java