ad
Merge branch 'master' of github.com:lyroge/open4u
Merge branch 'master' of github.com:lyroge/open4u

Conflicts:
	templates/product.tpl