16 farvardin
Merge branch 'master' of https://github.com/T1Easyware/Soheil

Conflicts:
	Soheil/Soheil.Common/Properties/Resources.Designer.cs
	Soheil/Soheil.Common/Properties/Resources.en.resx
	Soheil/Soheil.Common/Properties/Resources.resx
	Soheil/Soheil.Core/DataServices/Basics/MachineDataService.cs
	Soheil/Soheil.Core/DataServices/Basics/StationDataService.cs
	Soheil/Soheil.Core/ViewModels/MachineStationsVM.cs
	Soheil/Soheil.Core/ViewModels/StationMachinesVM.cs
	Soheil/Soheil.Dal/SoheilEdm.edmx
	Soheil/Soheil/Views/SoheilSplitView.xaml