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

Conflicts:
	projects/UnityWithCocktails/Assembly-CSharp-Editor.pidb
	projects/UnityWithCocktails/Assembly-CSharp.pidb
	projects/UnityWithCocktails/UnityWithCocktails.userprefs