to be able to pull
Problems with pulling
Merge branch 'master' of https://github.com/careelika/random

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