lab4
valisin selena
Merge remote-tracking branch 'origin/master'

Conflicts:

	POS/src/ee/ut/math/tvt/salessystem/domain/controller/SalesDomainController.java

	POS/src/ee/ut/math/tvt/salessystem/domain/exception/VerificationFailedException.java
	POS/src/ee/ut/math/tvt/salessystem/ui/ConsoleUI.java
	POS/src/ee/ut/math/tvt/salessystem/ui/model/PurchaseInfoTableModel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/model/StockTableModel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/tabs/HistoryTab.java
	POS/src/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab.java
	POS/src/ee/ut/math/tvt/salessystem/ui/tabs/StockTab.java