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

Conflicts:
	Mercato.PowerStorage.Touch/Mercato.PowerStorage.Touch.csproj