Initial commit
BizzHome1
a
Merge branch 'master' of github.com:T1Easyware/Soheil
Merge branch 'master' of github.com:T1Easyware/Soheil

Conflicts:
	README.md
	Soheil/Soheil.Core/Base/DataServiceBase.cs
	Soheil/Soheil.Core/DataServices/FPC/FPCDataService.cs
	Soheil/Soheil.Core/DataServices/FPC/StateDataService.cs
	Soheil/Soheil.Core/Soheil.Core.csproj
	Soheil/Soheil.Core/ViewModels/Fpc/ActivityGroupVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/ActivityVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/ConnectorVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/DragTarget.cs
	Soheil/Soheil.Core/ViewModels/Fpc/FpcVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/FpcWindowVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/MachineFamilyVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/MachineVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/ProductVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/ReworkVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/StateConfigVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/StateStationActivityMachineVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/StateStationActivityVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/StateStationVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/StateVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/StationMachineVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/StationVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/ToolboxItemVm.cs
	Soheil/Soheil.Core/ViewModels/Fpc/TreeItemVm.cs
	Soheil/Soheil.Dal/Soheil.Dal.csproj
	Soheil/Soheil.Dal/SoheilEdm.Designer.cs
	Soheil/Soheil.Dal/SoheilEdm.edmx
	Soheil/Soheil.Dal/SqlScripts/InitDatabaseforTest.sql
	Soheil/Soheil.Dal/SqlScripts/MultiInsertAccessRules.sql
	Soheil/Soheil/Views/Fpc/MidStateConfig.xaml
	Soheil/Soheil/Views/Fpc/Toolbox.xaml.cs
	Soheil/Soheil2.sln
bahman before sync
Merge branch 'master' of github.com:T1Easyware/Soheil

Conflicts:
	Soheil/Soheil.Core/Soheil.Core.csproj
	Soheil/Soheil.Dal/SoheilEdm.Designer.cs
	Soheil/Soheil.Dal/SoheilEdm.edmx.sql
	Soheil/Soheil.Dal/SqlScripts/InitDatabaseforTest.sql
	Soheil/Soheil.DbFix/Soheil.DbFix.csproj