cart
fix
Merge branch 'master' of https://github.com/SteamRiC/TeamNumberTwo

Conflicts:
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/AddProductWindow$1.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/AddProductWindow$2.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/AddProductWindow.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/StockTab$1.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/StockTab.class
	POS/log.log