Merge commit '398b61900179214910eeaa2362089ca6e613de88' into dungnguyen

Conflicts:
	shop/protected/modules/shop/views/products/view.php