Merge remote-tracking branch 'origin/development' into development

Conflicts:
	application/controllers/api/customer/item.php