ok
Merge branch 'Version3' of github.com:T1Easyware/Soheil into Version3

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