qw
Merge branch 'master' of git@github.com:paranoid-qian/sunweb.git

Conflicts:
	web-app/WEB-INF/velocity/web/products.vm