match category and brand for shop
about shop view
 Recovery code for /shop/ProductController.java
Merge " Recovery code for /shop/ProductController.java"
update shop category a link
about shop view
add new productManage/save.ftl/modified include/navigation.ftl
hibernateSearch Modify criteria query