Korrastus enne pulli
Merge branch 'master' of https://github.com/rere252/tarkvteh14r6

Conflicts:
	POS/data/POSdb.script