date stringiks
Merge branch 'master' of https://github.com/priitd/KOMP

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