created filter category
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/views/product/list_product.php