??? Some changes ???
Merge branch 'master' of https://github.com/eestikaa/Labidas

Conflicts:
	POS/data/POSdb.properties
	POS/src/ee/ut/math/tvt/salessystem/domain/data/SoldItem.java
	POS/src/ee/ut/math/tvt/salessystem/util/HibernateUtil.java