Merge origin/master

Conflicts:
	themes/demo_shop/views/shop/products/home.php