Product.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/lynk/quot/action/ProductAction.java
	src/main/java/com/lynk/quot/biz/ProductBiz.java
	src/main/java/com/lynk/quot/biz/impl/ProductBizImpl.java
	src/main/java/com/lynk/quot/dao/ProductMapper.java
	src/main/resources/config/struts.xml
	src/main/resources/sqlMaps/ProductMapper.xml