History fully working?
Merge branch 'master' of https://github.com/marekpagel/unum-quadrigis

Conflicts:
	POS/data/POSdb.log
	POS/src/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab.java