@ core/db/models/folder.php
@ core/db/models/item.php
Huge hot fixes on edit() method of both
Merge branch 'develop'

Conflicts:
	core/db/models/item.php