no message
Merge branch 'master' of https://github.com/SteamRiC/TeamNumberTwo

Conflicts:
	POS/build/classes/ee/ut/math/tvt/salessystem/domain/data/DisplayableItem.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/model/SalesSystemTableModel.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel$1.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel$2.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.class
	POS/src/ee/ut/math/tvt/salessystem/domain/data/DisplayableItem.java
	POS/src/ee/ut/math/tvt/salessystem/ui/model/SalesSystemTableModel.java
	POS/src/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.java