Final updates
Finished tests
Merge branch 'master' of https://github.com/karlkuusk/Lahe-Labor

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