Update to ILIAS 4.5 Beta1_rev53850
Merge conflicts resolved