image updates, other bits
Merge branch 'master' of https://github.com/HotPotato87/PSiOS

Conflicts:
	Mercato.PowerStorage.Touch/Info.plist

Mercato.PowerStorage.Touch/Views/Homepage/FeaturedProductListViewContain
er.xib