Added Product Searching

Added the ability to search products by name and category on the
products page.
Merge branch 'Glen' into ML

Conflicts:
	development/products.php
Push framework to site