Lab 4 Task 2.1, 2.2.
Merge branch 'master' of https://github.com/Maaartin/Team-1

Conflicts:
	POS/bin/ee/ut/math/tvt/salessystem/domain/controller/impl/SalesDomainControllerImpl.class
	POS/bin/ee/ut/math/tvt/salessystem/domain/data/SoldItem.class
	POS/bin/ee/ut/math/tvt/salessystem/ui/model/PurchaseInfoTableModel.class
	POS/bin/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel$1.class
	POS/bin/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel$2.class
	POS/bin/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.class
	POS/data/POSdb.lck
	POS/src/ee/ut/math/tvt/salessystem/domain/data/SoldItem.java
	POS/src/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.java