muutsin ja lisasin
Merge branch 'master' of https://github.com/lauralilleste/SoftEngine

Conflicts:
	POS/src/ee/ut/math/tvt/salessystem/domain/data/SoldItem.java