Searching for items is working.
Merge remote-tracking branch 'origin'

Conflicts:
	web/js/common.js