Db works, data will be fetched from db.
Merge branch 'master' of https://github.com/hendzu/mentor-keerlema

Conflicts:
	data/POSdb.properties
MErge solved