none
Merge branch 'master' of https://github.com/mix1/tarkvaratehnika

Conflicts:
	data/POSdb.log
	src/ee/ut/math/tvt/salessystem/domain/controller/impl/SalesDomainControllerImpl.java