fixed files
Merge origin/_aro_new

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