...
Designed 3D model of the Tower with all materials an so on.
Merge branch 'Parte-Roxanne'
Added cantimplora and scripts for the drinking from oasis.
Merge branch 'master' into Player

Conflicts:
	Assets/objects/Materials/cantimplora_base.mat.meta
	Assets/objects/palmtree_set.blend
	Assets/objects/palmtree_set.blend1
	Assets/objects/palmtree_set.blend1.meta
	Assets/objects/tower.blend
	Assets/objects/tower.blend1
	Assets/objects/tower.blend1.meta
	Assets/scripts/player_movement.cs
	ProjectSettings/TagManager.asset