feat segment fix
Merge branch 'master' of https://github.com/HotPotato87/PSiOS

Conflicts:
	Mercato.PowerStorage.Touch.userprefs