Refactored shop to have a two panel look.
Merge branch 'shop-improvements'

Conflicts:
	Assets/Scripts/Shop.cs