Fixed inventory collision
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity project/Assets/Scenes/TestPointClickScene.unity