Update
Merge branch 'master' of https://github.com/RivelloMultimediaConsulting/CodeSamplesPublic

Conflicts:

projects/UnityWithCocktails/Assets/UnityWithCocktails/Lessons/Lesson2.5_
Unity2D/Lesson2.5_Unity2D.unity