import search fields and product
Merge remote-tracking branch 'origin/master'

Conflicts:
	gap/apps/dashboard/catalogue/models.py
	gap/apps/dashboard/catalogue/views.py