@core/db.models/item.php: a fix happened
Merge branch 'develop'

Conflicts:
	core/db/models/item.php