Updated Inventory

The tabs now have a back button to navigate, and fixed bugs.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Demo Assets/Assets/Scripts/Map.cs