Merge remote-tracking branch 'remotes/origin/work' into work

* remotes/origin/work:
  puuh.. dont remember, just a lot ticket-stuff =)
  new Todos (not in todo file) and Bugs for @kije
  remove Comments
  refresh Combobox if edit a user AND CREATING a new one
  clear field after creating a department
  blub
  revert