Major Change (Block)
Merge branch 'master' of github.com:T1Easyware/Soheil
after Major Change (Block)
Conflicts:
	Soheil/Soheil.Dal/SoheilEdm.edmx
	Soheil/Soheil.Dal/SoheilEdm.edmx.sql