seller info to product detail
conflictconflictconflict
conf
Merge branch 'jspImpl' of https://github.com/dto80/CDU_CMU2.git into
jspImpl

Conflicts:
	src/main/java/edu/cmucdu/ecommerce/dao/product/SellerProductDao.java
	src/main/java/edu/cmucdu/ecommerce/service/product/ProductServiceImpl.java
	src/main/java/edu/cmucdu/ecommerce/web/custom/ProductDetailController.java
	src/main/resources/META-INF/spring/database.properties