p
Merge branch 'master' of https://github.com/silver17/Silveri-meeskond

Conflicts:
	POS/data/POSdb.lck
	POS/data/POSdb.log
	POS/data/POSdb.properties
	POS/data/POSdb.script
	POS/log/log.log