Database stuff.. something.
Merge branch 'master' of https://github.com/hendzu/mentor-keerlema

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