Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' into cangZhou

Conflicts:
	protected/extensions/shoppingCart/EShoppingCart.php
	themes/leather/views/item/view.php

Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>