Merge branch 'master' of github.com:imagecms/ImageCMS into template
Merge branch 'template' of github.com:imagecms/ImageCMS into template
front
Merge remote-tracking branch 'origin/template'
front
Merge branch 'master' of github.com:imagecms/ImageCMS
front
Small Fix
small fixing
front
Merge branch 'master' of github.com:imagecms/ImageCMS
photo_block
Merge remote-tracking branch 'origin/template'

Conflicts:
	templates/new_shop_template/shop/product.tpl
cart popup fix
front
Merge branch 'master' of github.com:imagecms/ImageCMS
product_view
Merge branch 'template'

Conflicts:
	application/modules/shop
	templates/new_shop_template/shop/product.tpl
fix
fix