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

Conflicts:

projects/UnityWithCocktails/Library/ScriptAssemblies/Assembly-CSharp-Edi
tor.dll.mdb

projects/UnityWithCocktails/Library/ScriptAssemblies/Assembly-CSharp.dll
.mdb
	projects/UnityWithCocktails/Library/assetDatabase3
	projects/UnityWithCocktails/Library/guidmapper

projects/UnityWithCocktails/Library/metadata/8b/8b925aefd690e4d63be1b96c
80e97810

projects/UnityWithCocktails/Library/metadata/a4/a42fc216e9b844f63a9fdd16
d6a22067

projects/UnityWithCocktails/Library/metadata/c3/c3f6867914043428ea4802ce
485bfd5f

projects/UnityWithCocktails/Library/metadata/ff/ff64ce2b3468a4c40b54de5e
2da0b6a0
	projects/UnityWithCocktails/UnityWithCocktails-csharp.sln
	projects/UnityWithCocktails/UnityWithCocktails.sln
	projects/UnityWithCocktails/UnityWithCocktails.userprefs