Merge remote-tracking branch 'origin/Home' into LCT-work

Conflicts:
	zirsakht-stock/bin/Debug/stock.mdf
	zirsakht-stock/bin/Debug/stock_log.ldf
	zirsakht-stock/frmImported.Designer.cs
	zirsakht-stock/frmImported.cs
	zirsakht-stock/frmkardex.Designer.cs
	zirsakht-stock/frmkardex.cs
	zirsakht-stock/frmkharid.Designer.cs
	zirsakht-stock/frmkharid.cs
	zirsakht-stock/frmkharid.resx
	zirsakht-stock/lqStock.dbml
	zirsakht-stock/lqStock.dbml.layout
	zirsakht-stock/lqStock.designer.cs
	zirsakht-stock/stock.mdf
	zirsakht-stock/stock_log.LDF