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

Conflicts:

Mercato.PowerStorage.Touch/Custom/Collection/MercatoTableInstantiatedSou
rce.cs
	Mercato.PowerStorage.Touch/Mercato.PowerStorage.Touch.csproj