solved merge conflicts with MaZiFAU branch

.DS_Store

Assets/.DS_Store

Assets/Resources/Prefabs/MainPlayer.prefab

Assets/Scenes/Worlds/RiverWorld.unity

Assets/Scripts/GameObjectExtensions.cs

Assets/Scripts/GenerateDemoFiles.cs

...tionEngine/Character_Animations/TaskCharakterAnimation.cs

Assets/Scripts/InteractionEngine/FactHandling/Fact.cs

...ts/Scripts/InteractionEngine/FactHandling/FactComparer.cs

Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs

Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs

...s/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs

Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs

...ripts/InteractionEngine/FactHandling/SolutionOrganizer.cs

Assets/Scripts/InteractionEngine/Gadgets/AngleTool.cs

Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs

Assets/Scripts/InteractionEngine/Gadgets/LineTool.cs

Assets/Scripts/InteractionEngine/Gadgets/Tape.cs

Assets/Scripts/InteractionEngine/WorldCursor.cs

Assets/Scripts/InventoryStuff/ScrollDetails.cs