Merge branch 'master' into Jump_v3_and_movement

# Conflicts:
#	Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab
#	Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab
#	Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/ZH.prefab
#	Assets/Jump_v2/Prefabs/Bosses/ZH.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab
#	Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/ground.prefab
#	Assets/Jump_v2/Prefabs/Bosses/ground.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab
#	Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/konzi.prefab
#	Assets/Jump_v2/Prefabs/Bosses/konzi.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/labor.prefab
#	Assets/Jump_v2/Prefabs/Bosses/labor.prefab.meta
#	Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab
#	Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab.meta
#	Assets/Jump_v2/Prefabs/Ground.prefab
#	Assets/Jump_v2/Prefabs/Player.prefab
#	Assets/Scenes/Basic_fizika.unity
#	Assets/Scripts/PlayerMove.cs
#	ProjectSettings/TagManager.asset