Merge branch 'master' of https://github.com:443/HotPotato87/PSiOS

Conflicts:

Mercato.PowerStorage.Touch/Views/Homepage/MainHomePageBrowseFamiliesView
.cs