front
front
front
move LocalStorage IE
fix more
adsf
Merge branch 'master' of github.com:imagecms/ImageCMS
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/js/shop.js
front
front
shipping related with payment methods
Merge branch 'master' of github.com:imagecms/ImageCMS into template

Conflicts:
	templates/new_shop_template/js/shop.js