Db with items
Merge branch 'master' of https://github.com/TaaviGilden/The-Team

Conflicts:
	POS/data/POSdb.lck
	POS/data/POSdb.log
	POS/data/POSdb.properties
	POS/log4j.log