LOT OF UPDATE
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentation/PacificEpoch.WinForm/packages.config