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

Conflicts:
	Soheil/Soheil.Common/Properties/Resources.Designer.cs
	Soheil/Soheil.Controls/Soheil.Controls.csproj