ok
ok
ok
ok
Merge branch 'master_ls' of https://github.com/weichg/weichg_cart into master_ls

Conflicts:

weichg_cart/public/catalog/view/theme/OPC070156/template/mobile_store/he
ader.tpl
Merge branch 'master_ls'

Conflicts:

weichg_cart/public/catalog/view/theme/OPC070156/template/mobile_store/he
ader.tpl