13 bedar
13
Merge branch 'master' of https://github.com/T1Easyware/Soheil

Conflicts:
	Soheil/Soheil.Controls/Soheil.Controls.csproj
	Soheil/Soheil.Dal/SoheilEdm.Designer.cs
	Soheil/Soheil.Dal/SoheilEdm.edmx.sql
	Soheil/Soheil/MainWindow.xaml
	Soheil/Soheil/Views/SoheilSplitView.xaml
	Soheil/Soheil/Views/SoheilSplitView.xaml.cs