mingi history tab asi
Merge branch 'master' of https://github.com/tmev/Ants

Conflicts:
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/HistoryTab.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab$5.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab$6.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab$7.class
	POS/build/classes/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab.class
	POS/build/jar/ANTS.jar
Merge branch 'master' of https://github.com/tmev/Ants