I put back my icons you asshole
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Scripts/ShopManager.js