Account State Info & fixes
Merge remote-tracking branch 'origin/sherpa/version/2' into sherpa/version/2

Conflicts:
	SherpaDesk/Info.xaml.cs