Item_search
Item_search
Merge remote-tracking branch 'origin/master'

Conflicts:
	store/models/product_dao.py
Item_search