tablet1
Merge branch 'Version3' of github.com:t1easyware/soheil

Conflicts:
	Soheil/Soheil.Dal/SoheilEdm.edmx
	Soheil/Soheil.Dal/SoheilEdm.edmx.sql
	Soheil/Soheil.Dal/SoheilEdm1.Designer.cs