???
Merge branch 'master' of https://github.com/silver17/Silveri-meeskond

Conflicts:
	POS/bin/ee/ut/math/tvt/silveri_meeskond/domain/controller/impl/SalesDomainControllerImpl.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/SalesSystemUI$1.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/SalesSystemUI.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/panels/ConfirmSaleUI$1.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/panels/ConfirmSaleUI$2.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/panels/ConfirmSaleUI$3.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/panels/ConfirmSaleUI.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/panels/PurchaseItemPanel$1.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/panels/PurchaseItemPanel.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/HistoryTab.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/PurchaseTab$1.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/PurchaseTab$2.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/PurchaseTab$3.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/PurchaseTab.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/StockTab$1.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/StockTab$2.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/StockTab$3.class
	POS/bin/ee/ut/math/tvt/silveri_meeskond/ui/tabs/StockTab.class
??? vol 2