z
z
Merge branch 'master' of github.com:T1Easyware/Soheil

Conflicts:
	Soheil/Soheil.Core/ViewModels/PP/Editor/PPEditorProcess.cs
Merge branch 'master' of github.com:T1Easyware/Soheil

Conflicts:
	Soheil/Soheil.Dal/SoheilEdm.Designer.cs
	Soheil/Soheil.Dal/SoheilEdm.edmx.sql