Issue #5685: Repair resource loading and some minor problems
Merge pull request #1993 from VisualSJ/v3.0-rc0-hotfix

Issue #5685: Repair resource loading and some minor problems