some changes
Merge branch 'master' of https://github.com/vimle/grazia

Conflicts:
	single-product.php