almost there
Merge branch 'master' of https://github.com/Jjarve/Cervisiam

Conflicts:
	POS/data/POSdb.properties
	POS/src/ee/ut/math/tvt/salessystem/ui/model/HistoryTableModel.java
almost