scene_001
housing_area
added hierarchy for 03_HousingArea + added houses
Zwischenstand
created PlayerPrefab vs 0.1
merged newestFeatures into LevelDesignBranch
Removed old Stuff
update SceneData
added houses
added 04_HousingArea Around and Inner Houses
Zwischenstand
zwischenstand vor branch wechsel
Add Items

Merge remote-tracking branch 'origin/LevelDesignBranch' into Art_And_Modelling

Conflicts:
	Thalos/Assets/Meshes/Bolt.blend.meta
	Thalos/Assets/Meshes/Bolt_Basic.fbx.meta
	Thalos/Assets/Meshes/Environment/Houses/House_04.blend.meta
	Thalos/Assets/Meshes/Environment/Houses/Materials/Window.mat
	Thalos/Assets/Meshes/Environment/Houses/Window_02.blend.meta
	Thalos/Assets/Meshes/Environment/Houses/Window_03.blend.meta
	Thalos/Assets/New Terrain 5.asset
	Thalos/Assets/Prefabs/Ice_Test_01.fbx.meta
	Thalos/Assets/RootMotionScript.cs
	Thalos/Assets/RootMotionScript.cs.meta
	Thalos/Assets/Scenes/Debug_Scenes/Debug_Scene_Martin.unity
	Thalos/Assets/Scenes/Debug_Scenes/Hero_NoFinalRigh_Run_Idle_Walk2 1.prefab
	Thalos/Assets/Scenes/Debug_Scenes/MainCamera.prefab
	Thalos/Assets/Scenes/GameScenes/scene_01.unity
	Thalos/Assets/Scripts/Controller/Constants.cs
	Thalos/Assets/Scripts/Controller/RootMotionScript.cs
	Thalos/Assets/Scripts/Controller/RootMotionScript.cs.meta
	Thalos/Assets/Scripts/DebugScripts/Debug_Playerstats.cs
	Thalos/Assets/Scripts/GazeUI/GazeGui_DoAnimation.cs
	Thalos/Assets/Scripts/PlayerControl/PlayerInputManager.cs
	Thalos/Assets/Scripts/PlayerManager/PlayerModel.cs
	Thalos/Assets/Scripts/PlayerManager/PlayerStateController.cs
	Thalos/Assets/Scripts/RootMotionScript.cs
	Thalos/Assets/Scripts/RootMotionScript.cs.meta
	Thalos/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Nighttime Water.mat
	Thalos/Assets/Standard Assets/Water (Pro Only)/Sources/Objects/Materials/water plane-lambert1.mat
	Thalos/Assets/Water FX Pack/Models/OBJ_WaterfallBig.fbx.meta
	Thalos/ProjectSettings/DynamicsManager.asset
	Thalos/ProjectSettings/EditorBuildSettings.asset
	Thalos/ProjectSettings/TagManager.asset