No comment
Merge remote-tracking branch 'origin/last_strat&otherStuff' into last_strat&otherStuff2

Conflicts:
	ISEdesign/ShareholderView.cs