ResourceManager load/save-file + Class Diagram
Merge remote-tracking branch 'origin/Sebastian'