Che xiang,
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentation/PacificEpoch.WinForm/Properties/AssemblyInfo.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Presentation/PacificEpoch.WinForm/Properties/AssemblyInfo.cs