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

Conflicts:
	Soheil/Soheil.Dal/Soheil.Dal.csproj
	Soheil/Soheil.Dal/SoheilEdm.edmx.sql