opr test
Merge branch 'master' of https://github.com/T1Easyware/Soheil

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