Tweaked minor stuff here and there.
Merge remote-tracking branch 'origin/ui' into businesslogic
Hint modified
Merge remote-tracking branch 'origin/businesslogic' into ui
Remove unused imports