备份
Merge branch 'master' of https://github.com/liu4ze4heng4/ikea.git

Conflicts:
	ikea-tow/resources/velocity/productDetail.vm
	ikea-tow/src/main/java/com/fec/shop/MainDriver.java
	ikea-tow/src/main/java/com/fec/shop/model/Product.java
	ikea-tow/src/main/java/com/fec/shop/util/SQLHelper.java