JavaScript TreeView modification
JavaScript TreeView modification
JavaScript TreeView modification
JavaScript TreeView modification
JavaScript TreeView modification
JavaScript TreeView modification
JavaScript TreeView modification
Merge remote-tracking branch 'origin/site/productCategory/display' into site/product_category

Conflicts:
	css/tree-viewer.css
	js/tree_viewer.js
	protected/controllers/ProductCategoryController.php
	protected/models/ProductCategory.php
	protected/views/productCategory/display.php
site/categoryProducts/viewProducts
Merge remote-tracking branch 'origin/site/product/base' into site/productCategory/viewProducts
Add product model
Add product model
productCategory/viewProducts modification
Merge remote-tracking branch 'origin/site/productCategory/viewProducts' into site/product/searchFilter
Merge branch 'site/productCategory/viewProducts' into site/product/searchFilter
productCategory/viewProducts modification
productCategory/display

Use category name to display the category
productCategory/display

Use category name to display the category