Check.png
93-03-29
Merge branch 'master' of https://github.com/T1Easyware/Soheil

Conflicts:
	Soheil/Soheil.Common/Properties/Resources.en.resx
	Soheil/Soheil.Common/Properties/Resources.resx
	Soheil/Soheil.Controls/Soheil.Controls.csproj
	Soheil/Soheil.Core/DataServices/Basics/StationDataService.cs
	Soheil/Soheil.Core/DataServices/PP/BlockDataService.cs