Merge origin/master

Conflicts:
	item.php
Merge origin/master

Conflicts:
	item.php