添加模板引擎
Merge branch 'master' of https://github.com/liu4ze4heng4/ikea.git

Conflicts:
	ikea-tow/resources/velocity/productDetail.vm