Problems with inventory HUD, currently disabled
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/BaseLevel.unity