930608
Merge branch 'Version3' of https://github.com/T1Easyware/Soheil into version3

Conflicts:
	Soheil/Soheil.Common/Properties/Resources.en.resx
	Soheil/Soheil.Common/Properties/Resources.resx