some updates, mostly interface stuff
Merge branch 'master' of https://github.com/PMGK-Gr1/TheGame

Conflicts:
	Game/Assets/MainGame/New_Menu-Shop-Death/New_Menu-Shop-Death.unity
	Game/ProjectSettings/ProjectSettings.asset
Merge branch 'master' of https://github.com/PMGK-Gr1/TheGame

Conflicts:
	Game/Assets/MainGame/MainScene.unity
	Game/ProjectSettings/Physics2DSettings.asset
Merge branch 'master' of https://github.com/PMGK-Gr1/TheGame